Commit 2ae159b3 authored by Evan Hunt's avatar Evan Hunt

[master] globally rename "delve" to "delv"

3817.	[func]		The "delve" command is now spelled "delv" to avoid
			a namespace collision with the Xapian project.
			[RT #35801]
parent 953189d3
3816. [func] "dig +qr" now reports query size. (Thanks to
Tony Finch.) [RT #35822]
3815. [doc] Clarify "nsupdate -y" usage in man page. [RT #35808]
3814. [func] The "masterfile-style" zone option controls the
formatting of dumped zone files. Options are
"relative" (multiline format) and "full" (one
......@@ -22,6 +20,12 @@
--- 9.10.0 released ---
3817. [func] The "delve" command is now spelled "delv" to avoid
a namespace collision with the Xapian project.
[RT #35801]
3815. [doc] Clarify "nsupdate -y" usage in man page. [RT #35808]
3810. [bug] Work around broken nameservers that fail to ignore
unknown EDNS options. [RT #35766]
......
......@@ -82,12 +82,15 @@ BIND 9.10.0
- A new zone file format, "map", stores zone data in a
format that can be mapped directly into memory, allowing
significantly faster zone loading.
- "delve" (domain entity lookup and validation engine) is a
new tool with dig-like semantics for looking up DNS data
and performing internal DNSSEC validation. This allows
easy validation in environments where the resolver may
not be trustworthy, and assists with troubleshooting of
DNSSEC problems.
- "delv" (domain entity lookup and validation) is a new tool
with dig-like semantics for looking up DNS data and performing
internal DNSSEC validation. This allows easy validation in
environments where the resolver may not be trustworthy, and
assists with troubleshooting of DNSSEC problems. (NOTE:
In previous development releases of BIND 9.10, this utility
was called "delve". The spelling has been changed to avoid
confusion with the "delve" utility that included with
the Xapian search engine.)
- Improved EDNS(0) processing for better resolver performance
and reliability over slow or lossy connections.
- A new "configure --with-tuning=large" option tunes certain
......
......@@ -19,7 +19,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
SUBDIRS = named rndc dig delve dnssec tools tests nsupdate \
SUBDIRS = named rndc dig delv dnssec tools tests nsupdate \
check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
TARGETS =
......
......@@ -44,36 +44,33 @@ NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
SUBDIRS =
TARGETS = delve@EXEEXT@
TARGETS = delv@EXEEXT@
OBJS = delve.@O@
OBJS = delv.@O@
SRCS = delve.c
SRCS = delv.c
MANPAGES = delve.1
MANPAGES = delv.1
HTMLPAGES = delve.html
HTMLPAGES = delv.html
MANOBJS = ${MANPAGES} ${HTMLPAGES}
@BIND9_MAKE_RULES@
delve@EXEEXT@: delve.@O@ ${DEPLIBS}
export BASEOBJS="delve.@O@"; \
delv@EXEEXT@: delv.@O@ ${DEPLIBS}
export BASEOBJS="delv.@O@"; \
export LIBS0="${DNSLIBS}"; \
${FINALBUILDCMD}
# ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
# delve.@O@ ${LIBS}
installdirs:
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
install:: delve@EXEEXT@ installdirs
install:: delv@EXEEXT@ installdirs
${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} \
delve@EXEEXT@ ${DESTDIR}${bindir}
${INSTALL_DATA} ${srcdir}/delve.1 ${DESTDIR}${mandir}/man1
delv@EXEEXT@ ${DESTDIR}${bindir}
${INSTALL_DATA} ${srcdir}/delv.1 ${DESTDIR}${mandir}/man1
doc man:: ${MANOBJS}
......
......@@ -88,7 +88,7 @@
#define MAXNAME (DNS_NAME_MAXTEXT+1)
/* Variables used internally by delve. */
/* Variables used internally by delv. */
char *progname;
static isc_mem_t *mctx = NULL;
static isc_log_t *lctx = NULL;
......@@ -155,7 +155,7 @@ parse_uint(isc_uint32_t *uip, const char *value, isc_uint32_t max,
static void
usage(void) {
fputs(
"Usage: delve [@server] {q-opt} {d-opt} [domain] [q-type] [q-class]\n"
"Usage: delv [@server] {q-opt} {d-opt} [domain] [q-type] [q-class]\n"
"Where: domain is in the Domain Name System\n"
" q-class is one of (in,hs,ch,...) [default: in]\n"
" q-type is one of (a,any,mx,ns,soa,hinfo,axfr,txt,...) [default:a]\n"
......@@ -230,22 +230,22 @@ warn(const char *format, ...) {
}
static isc_logcategory_t categories[] = {
{ "delve", 0 },
{ "delv", 0 },
{ NULL, 0 }
};
#define LOGCATEGORY_DEFAULT (&categories[0])
#define LOGMODULE_DEFAULT (&modules[0])
static isc_logmodule_t modules[] = {
{ "delve", 0 },
{ "delv", 0 },
{ NULL, 0 }
};
static void
delve_log(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3);
delv_log(int level, const char *fmt, ...) ISC_FORMAT_PRINTF(2, 3);
static void
delve_log(int level, const char *fmt, ...) {
delv_log(int level, const char *fmt, ...) {
va_list ap;
char msgbuf[2048];
......@@ -416,7 +416,7 @@ printdata(dns_rdataset_t *rdataset, dns_name_t *owner,
if (!dns_rdataset_isassociated(rdataset)) {
char namebuf[DNS_NAME_FORMATSIZE];
dns_name_format(owner, namebuf, sizeof(namebuf));
delve_log(ISC_LOG_DEBUG(4),
delv_log(ISC_LOG_DEBUG(4),
"WARN: empty rdataset %s", namebuf);
return (ISC_R_SUCCESS);
}
......@@ -556,7 +556,7 @@ convert_name(dns_fixedname_t *fn, dns_name_t **name, const char *text) {
result = dns_name_fromtext(n, &b, dns_rootname, 0, NULL);
if (result != ISC_R_SUCCESS) {
delve_log(ISC_LOG_ERROR, "failed to convert QNAME %s: %s",
delv_log(ISC_LOG_ERROR, "failed to convert QNAME %s: %s",
text, isc_result_totext(result));
return (result);
}
......@@ -595,10 +595,10 @@ key_fromconfig(const cfg_obj_t *key, dns_client_t *client) {
return (ISC_R_SUCCESS);
if (match_root)
delve_log(ISC_LOG_DEBUG(3), "adding trust anchor %s",
delv_log(ISC_LOG_DEBUG(3), "adding trust anchor %s",
trust_anchor);
if (match_dlv)
delve_log(ISC_LOG_DEBUG(3), "adding DLV trust anchor %s",
delv_log(ISC_LOG_DEBUG(3), "adding DLV trust anchor %s",
dlv_anchor);
flags = cfg_obj_asuint32(cfg_tuple_get(key, "flags"));
......@@ -762,7 +762,7 @@ setup_dnsseckeys(dns_client_t *client) {
cleanup:
if (result != ISC_R_SUCCESS)
delve_log(ISC_LOG_ERROR, "setup_dnsseckeys: %s",
delv_log(ISC_LOG_ERROR, "setup_dnsseckeys: %s",
isc_result_totext(result));
return (result);
}
......@@ -811,7 +811,7 @@ addserver(dns_client_t *client) {
hints.ai_protocol = IPPROTO_UDP;
gai_error = getaddrinfo(server, port, &hints, &res);
if (gai_error != 0) {
delve_log(ISC_LOG_ERROR,
delv_log(ISC_LOG_ERROR,
"getaddrinfo failed: %s",
gai_strerror(gai_error));
return (ISC_R_FAILURE);
......@@ -848,7 +848,7 @@ addserver(dns_client_t *client) {
}
if (result != ISC_R_SUCCESS)
delve_log(ISC_LOG_ERROR, "addserver: %s",
delv_log(ISC_LOG_ERROR, "addserver: %s",
isc_result_totext(result));
return (result);
......@@ -868,7 +868,7 @@ findserver(dns_client_t *client) {
result = irs_resconf_load(mctx, "/etc/resolv.conf", &resconf);
if (result != ISC_R_SUCCESS && result != ISC_R_FILENOTFOUND) {
delve_log(ISC_LOG_ERROR, "irs_resconf_load: %s",
delv_log(ISC_LOG_ERROR, "irs_resconf_load: %s",
isc_result_totext(result));
goto cleanup;
}
......@@ -925,7 +925,7 @@ findserver(dns_client_t *client) {
result = dns_client_setservers(client, dns_rdataclass_in, NULL,
nameservers);
if (result != ISC_R_SUCCESS)
delve_log(ISC_LOG_ERROR, "dns_client_setservers: %s",
delv_log(ISC_LOG_ERROR, "dns_client_setservers: %s",
isc_result_totext(result));
cleanup:
......@@ -1207,7 +1207,7 @@ dash_option(char *option, char *next, isc_boolean_t *open_type_class) {
/* handled in preparse_args() */
break;
case 'v':
fputs("delve " VERSION "\n", stderr);
fputs("delv " VERSION "\n", stderr);
exit(0);
/* NOTREACHED */
default:
......@@ -1363,7 +1363,7 @@ preparse_args(int argc, char **argv) {
/*
* Argument parsing is based on dig, but simplified: only one
* QNAME/QCLASS/QTYPE tuple can be specified, and options have
* been removed that aren't applicable to delve. The interface
* been removed that aren't applicable to delv. The interface
* should be familiar to dig users, however.
*/
static void
......@@ -1576,7 +1576,7 @@ main(int argc, char *argv[]) {
result = dns_client_createx2(mctx, actx, taskmgr, socketmgr, timermgr,
clopt, &client, srcaddr4, srcaddr6);
if (result != ISC_R_SUCCESS) {
delve_log(ISC_LOG_ERROR, "dns_client_create: %s",
delv_log(ISC_LOG_ERROR, "dns_client_create: %s",
isc_result_totext(result));
goto cleanup;
}
......@@ -1606,7 +1606,7 @@ main(int argc, char *argv[]) {
result = dns_client_resolve(client, query_name, dns_rdataclass_in,
qtype, resopt, &namelist);
if (result != ISC_R_SUCCESS)
delve_log(ISC_LOG_ERROR, "resolution failed: %s",
delv_log(ISC_LOG_ERROR, "resolution failed: %s",
isc_result_totext(result));
for (response_name = ISC_LIST_HEAD(namelist);
......@@ -1617,7 +1617,7 @@ main(int argc, char *argv[]) {
rdataset = ISC_LIST_NEXT(rdataset, link)) {
result = printdata(rdataset, response_name, style);
if (result != ISC_R_SUCCESS)
delve_log(ISC_LOG_ERROR, "print data failed");
delv_log(ISC_LOG_ERROR, "print data failed");
}
}
......
......@@ -17,20 +17,20 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<refentry id="man.delve">
<refentry id="man.delv">
<refentryinfo>
<date>February 21, 2014</date>
<date>April 23, 2014</date>
</refentryinfo>
<refmeta>
<refentrytitle>delve</refentrytitle>
<refentrytitle>delv</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo>BIND9</refmiscinfo>
</refmeta>
<refnamediv>
<refname>delve</refname>
<refname>delv</refname>
<refpurpose>DNS lookup and validation utility</refpurpose>
</refnamediv>
......@@ -43,7 +43,7 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>delve</command>
<command>delv</command>
<arg choice="opt">@server</arg>
<arg><option>-4</option></arg>
<arg><option>-6</option></arg>
......@@ -64,17 +64,17 @@
</cmdsynopsis>
<cmdsynopsis>
<command>delve</command>
<command>delv</command>
<arg><option>-h</option></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>delve</command>
<command>delv</command>
<arg><option>-v</option></arg>
</cmdsynopsis>
<cmdsynopsis>
<command>delve</command>
<command>delv</command>
<arg choice="opt" rep="repeat">queryopt</arg>
<arg choice="opt" rep="repeat">query</arg>
</cmdsynopsis>
......@@ -82,13 +82,13 @@
<refsect1>
<title>DESCRIPTION</title>
<para><command>delve</command>
(Domain Entity Lookup &amp; Validation Engine) is a tool for sending
<para><command>delv</command>
(Domain Entity Lookup &amp; Validation) is a tool for sending
DNS queries and validating the results, using the the same internal
resolver and validator logic as <command>named</command>.
</para>
<para>
<command>delve</command> will send to a specified name server all
<command>delv</command> will send to a specified name server all
queries needed to fetch and validate the requested data; this
includes the original requested query, subsequent queries to follow
CNAME or DNAME chains, and queries for DNSKEY, DS and DLV records
......@@ -101,25 +101,25 @@
By default, responses are validated using built-in DNSSEC trust
anchors for the root zone (".") and for the ISC DNSSEC lookaside
validation zone ("dlv.isc.org"). Records returned by
<command>delve</command> are either fully validated or
<command>delv</command> are either fully validated or
were not signed. If validation fails, an explanation of
the failure is included in the output; the validation process
can be traced in detail. Because <command>delve</command> does
can be traced in detail. Because <command>delv</command> does
not rely on an external server to carry out validation, it can
be used to check the validity of DNS responses in environments
where local name servers may not be trustworthy.
</para>
<para>
Unless it is told to query a specific name server,
<command>delve</command> will try each of the servers listed in
<command>delv</command> will try each of the servers listed in
<filename>/etc/resolv.conf</filename>. If no usable server
addresses are found, <command>delve</command> will send
addresses are found, <command>delv</command> will send
queries to the localhost addresses (127.0.0.1 for IPv4, ::1
for IPv6).
</para>
<para>
When no command line arguments or options are given,
<command>delve</command> will perform an NS query for "."
<command>delv</command> will perform an NS query for "."
(the root zone).
</para>
</refsect1>
......@@ -128,8 +128,8 @@
<title>SIMPLE USAGE</title>
<para>
A typical invocation of <command>delve</command> looks like:
<programlisting> delve @server name type </programlisting>
A typical invocation of <command>delv</command> looks like:
<programlisting> delv @server name type </programlisting>
where:
<variablelist>
......@@ -141,21 +141,21 @@
can be an IPv4 address in dotted-decimal notation or an IPv6
address in colon-delimited notation. When the supplied
<parameter>server</parameter> argument is a hostname,
<command>delve</command> resolves that name before
<command>delv</command> resolves that name before
querying that name server (note, however, that this
initial lookup is <emphasis>not</emphasis> validated
by DNSSEC).
</para>
<para>
If no <parameter>server</parameter> argument is
provided, <command>delve</command> consults
provided, <command>delv</command> consults
<filename>/etc/resolv.conf</filename>; if an
address is found there, it queries the name server at
that address. If either of the <option>-4</option> or
<option>-6</option> options are in use, then
only addresses for the corresponding transport
will be tried. If no usable addresses are found,
<command>delve</command> will send queries to
<command>delv</command> will send queries to
the localhost addresses (127.0.0.1 for IPv4,
::1 for IPv6).
</para>
......@@ -180,7 +180,7 @@
<parameter>type</parameter> can be any valid query
type. If no
<parameter>type</parameter> argument is supplied,
<command>delve</command> will perform a lookup for an
<command>delv</command> will perform a lookup for an
A record.
</para>
</listitem>
......@@ -213,17 +213,17 @@
</para>
<para>
Note: When reading the trust anchor file,
<command>delve</command> treats <option>managed-keys</option>
<command>delv</command> treats <option>managed-keys</option>
statements and <option>trusted-keys</option> statements
identically. That is, for a managed key, it is the
<emphasis>initial</emphasis> key that is trusted; RFC 5011
key management is not supported. <command>delve</command>
key management is not supported. <command>delv</command>
will not consult the managed-keys database maintained by
<command>named</command>. This means that if either of the
keys in <filename>/etc/bind.keys</filename> is revoked
and rolled over, it will be necessary to update
<filename>/etc/bind.keys</filename> to use DNSSEC
validation in <command>delve</command>.
validation in <command>delv</command>.
</para>
</listitem>
</varlistentry>
......@@ -246,7 +246,7 @@
<listitem>
<para>
Sets the query class for the requested data. Currently,
only class "IN" is supported in <command>delve</command>
only class "IN" is supported in <command>delv</command>
and any other value is ignored.
</para>
</listitem>
......@@ -259,7 +259,7 @@
Set the systemwide debug level to <option>level</option>.
The allowed range is from 0 to 99.
The default is 0 (no debugging).
Debugging traces from <command>delve</command> become
Debugging traces from <command>delv</command> become
more verbose as the debug level increases.
See the <option>+mtrace</option>, <option>+rtrace</option>,
and <option>+vtrace</option> options below for additional
......@@ -272,7 +272,7 @@
<term>-h</term>
<listitem>
<para>
Display the <command>delve</command> help usage output and exit.
Display the <command>delv</command> help usage output and exit.
</para>
</listitem>
</varlistentry>
......@@ -285,7 +285,7 @@
(Note, however, this does not set the CD bit on upstream
queries. If the server being queried is performing DNSSEC
validation, then it will not return invalid data; this
can cause <command>delve</command> to time out. When it
can cause <command>delv</command> to time out. When it
is necessary to examine invalid data to debug a DNSSEC
problem, use <command>dig +cd</command>.)
</para>
......@@ -350,7 +350,7 @@
<term>-v</term>
<listitem>
<para>
Print the <command>delve</command> version and exit.
Print the <command>delv</command> version and exit.
</para>
</listitem>
</varlistentry>
......@@ -364,7 +364,7 @@
dotted-decimal notation, or a colon-delimited IPv6 address.
When <option>-x</option> is used, there is no need to provide
the <parameter>name</parameter> or <parameter>type</parameter>
arguments. <command>delve</command> automatically performs a
arguments. <command>delv</command> automatically performs a
lookup for a name like <literal>11.12.13.10.in-addr.arpa</literal>
and sets the query type to PTR. IPv6 addresses are looked up
using nibble format under the IP6.ARPA domain.
......@@ -376,7 +376,7 @@
<term>-4</term>
<listitem>
<para>
Forces <command>delve</command> to only use IPv4.
Forces <command>delv</command> to only use IPv4.
</para>
</listitem>
</varlistentry>
......@@ -385,7 +385,7 @@
<term>-6</term>
<listitem>
<para>
Forces <command>delve</command> to only use IPv6.
Forces <command>delv</command> to only use IPv6.
</para>
</listitem>
</varlistentry>
......@@ -396,7 +396,7 @@
<refsect1>
<title>QUERY OPTIONS</title>
<para><command>delve</command>
<para><command>delv</command>
provides a number of query options which affect the way results are
displayed, and in some cases the way lookups are performed.
</para>
......@@ -416,12 +416,12 @@
<listitem>
<para>
Controls whether to set the CD (checking disabled) bit in
queries sent by <command>delve</command>. This may be useful
queries sent by <command>delv</command>. This may be useful
when troubleshooting DNSSEC problems from behind a validating
resolver. A validating resolver will block invalid responses,
making it difficult to retrieve them for analysis. Setting
the CD flag on queries will cause the resolver to return
invalid responses, which <command>delve</command> can then
invalid responses, which <command>delv</command> can then
validate internally and report the errors in detail.
</para>
</listitem>
......@@ -452,7 +452,7 @@
<listitem>
<para>
Toggle resolver fetch logging. This reports the
name and type of each query sent by <command>delve</command>
name and type of each query sent by <command>delv</command>
in the process of carrying out the resolution and validation
process: this includes including the original query and
all subsequent queries to follow CNAMEs and to establish a
......@@ -473,7 +473,7 @@
<listitem>
<para>
Toggle message logging. This produces a detailed dump of
the responses received by <command>delve</command> in the
the responses received by <command>delv</command> in the
process of carrying out the resolution and validation process.
</para>
<para>
......@@ -595,7 +595,7 @@
Print long records (such as RRSIG, DNSKEY, and SOA records)
in a verbose multi-line format with human-readable comments.
The default is to print each record on a single line, to
facilitate machine parsing of the <command>delve</command>
facilitate machine parsing of the <command>delv</command>
output.
</para>
</listitem>
......@@ -606,7 +606,7 @@
<listitem>
<para>
Indicates whether to display RRSIG records in the
<command>delve</command> output. The default is to
<command>delv</command> output. The default is to
do so. Note that (unlike in <command>dig</command>)
this does <emphasis>not</emphasis> control whether to
request DNSSEC records or whether to validate them.
......
# Microsoft Developer Studio Project File - Name="delve" - Package Owner=<4>
# Microsoft Developer Studio Project File - Name="delv" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103
CFG=delve - @PLATFORM@ Debug
CFG=delv - @PLATFORM@ Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "delve.mak".
!MESSAGE NMAKE /f "delv.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "delve.mak" CFG="delve - @PLATFORM@ Debug"
!MESSAGE NMAKE /f "delv.mak" CFG="delv - @PLATFORM@ Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "delve - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
!MESSAGE "delve - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
!MESSAGE "delv - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
!MESSAGE "delv - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
!MESSAGE
# Begin Project
......@@ -28,7 +28,7 @@ CFG=delve - @PLATFORM@ Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "delve - @PLATFORM@ Release"
!IF "$(CFG)" == "delv - @PLATFORM@ Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
......@@ -50,9 +50,9 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console @MACHINE@
# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/irs/win32/Release/libirs.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/delve.exe"
# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/irs/win32/Release/libirs.lib /nologo /subsystem:console @MACHINE@ /out:"../../../Build/Release/delv.exe"
!ELSEIF "$(CFG)" == "delve - @PLATFORM@ Debug"
!ELSEIF "$(CFG)" == "delv - @PLATFORM@ Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
......@@ -75,20 +75,20 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug @MACHINE@ /pdbtype:sept
# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/irs/win32/Debug/libirs.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/delve.exe" /pdbtype:sept
# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib ../../../lib/isccfg/win32/Debug/libisccfg.lib ../../../lib/irs/win32/Debug/libirs.lib /nologo /subsystem:console /debug @MACHINE@ /out:"../../../Build/Debug/delv.exe" /pdbtype:sept
!ENDIF
# Begin Target
# Name "delve - @PLATFORM@ Release"
# Name "delve - @PLATFORM@ Debug"
# Name "delv - @PLATFORM@ Release"
# Name "delv - @PLATFORM@ Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE="..\delve.c"
SOURCE="..\delv.c"
# End Source File
# End Group
# Begin Group "Header Files"
......
......@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
###############################################################################
Project: "delve"=".\delve.dsp" - Package Owner=<4>
Project: "delv"=".\delv.dsp" - Package Owner=<4>
Package=<5>
{{{
......
# Microsoft Developer Studio Generated NMAKE File, Based on delve.dsp
# Microsoft Developer Studio Generated NMAKE File, Based on delv.dsp
!IF "$(CFG)" == ""
CFG=delve - @PLATFORM@ Debug
!MESSAGE No configuration specified. Defaulting to delve - @PLATFORM@ Debug.
CFG=delv - @PLATFORM@ Debug
!MESSAGE No configuration specified. Defaulting to delv - @PLATFORM@ Debug.
!ENDIF
!IF "$(CFG)" != "delve - @PLATFORM@ Release" && "$(CFG)" != "delve - @PLATFORM@ Debug"
!IF "$(CFG)" != "delv - @PLATFORM@ Release" && "$(CFG)" != "delv - @PLATFORM@ Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "delve.mak" CFG="delve - @PLATFORM@ Debug"
!MESSAGE NMAKE /f "delv.mak" CFG="delv - @PLATFORM@ Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "delve - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
!MESSAGE "delve - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
!MESSAGE "delv - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application")
!MESSAGE "delv - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
......@@ -25,7 +25,7 @@ NULL=
NULL=nul
!ENDIF
!IF "$(CFG)" == "delve - @PLATFORM@ Release"
!IF "$(CFG)" == "delv - @PLATFORM@ Release"
_VC_MANIFEST_INC=0
_VC_MANIFEST_BASENAME=__VC80
!ELSE
......@@ -100,25 +100,25 @@ _VC_MANIFEST_CLEAN=
!endif
!IF "$(CFG)" == "delve - @PLATFORM@ Release"
!IF "$(CFG)" == "delv - @PLATFORM@ Release"
OUTDIR=.\Release
INTDIR=.\Release
ALL : "..\..\..\Build\Release\delve.exe"
ALL : "..\..\..\Build\Release\delv.exe"
CLEAN :
-@erase "$(INTDIR)\delve.obj"
-@erase "$(INTDIR)\delv.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "..\..\..\Build\Release\delve.exe"
-@erase "..\..\..\Build\Release\delv.exe"
-@$(_VC_MANIFEST_CLEAN)
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/irs/win32/include" /I "../../../lib/irs/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\delve.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isccfg/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/irs/win32/include" /I "../../../lib/irs/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\delv.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
......@@ -152,21 +152,21 @@ CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "../../../" @LIBXML2_INC@ @OPENS
RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\delve.bsc"
BSC32_FLAGS=/nologo /o"$(OUTDIR)\delv.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/irs/win32/Release/libirs.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\delve.pdb" @MACHINE@ /out:"../../../Build/Release/delve.exe"
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib ../../../lib/isccfg/win32/Release/libisccfg.lib ../../../lib/irs/win32/Release/libirs.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\delv.pdb" @MACHINE@ /out:"../../../Build/Release/delv.exe"