From: Evan Hunt Date: Wed, 23 Apr 2014 18:15:36 +0000 (-0700) Subject: [v9_10] globally rename "delve" to "delv" X-Git-Tag: v9.10.0rc2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8103fbabd56aee79714c8d5d4dc0d9664fd7d1d7;p=thirdparty%2Fbind9.git [v9_10] 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] (cherry picked from commit 2ae159b376dac23870d8005563c585acf85a4b5a) --- diff --git a/CHANGES b/CHANGES index 0b065329371..45c663d4fe3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,11 @@ -3815. [doc] Clarify "nsupdate -y" usage in man page. [RT #35808] - --- 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] diff --git a/README b/README index aed2f7fd204..37b445eb46a 100644 --- a/README +++ b/README @@ -74,12 +74,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 diff --git a/bin/Makefile.in b/bin/Makefile.in index b69525e337f..e3aeffbf924 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -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 = diff --git a/bin/delve/Makefile.in b/bin/delv/Makefile.in similarity index 84% rename from bin/delve/Makefile.in rename to bin/delv/Makefile.in index a0c52996cd2..7569bd7fe46 100644 --- a/bin/delve/Makefile.in +++ b/bin/delv/Makefile.in @@ -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} diff --git a/bin/delve/delve.1 b/bin/delv/delv.1 similarity index 100% rename from bin/delve/delve.1 rename to bin/delv/delv.1 diff --git a/bin/delve/delve.c b/bin/delv/delv.c similarity index 97% rename from bin/delve/delve.c rename to bin/delv/delv.c index b8a2d31c663..0bb874d461f 100644 --- a/bin/delve/delve.c +++ b/bin/delv/delv.c @@ -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"); } } diff --git a/bin/delve/delve.docbook b/bin/delv/delv.docbook similarity index 90% rename from bin/delve/delve.docbook rename to bin/delv/delv.docbook index 75630b863a6..7d05b59c46d 100644 --- a/bin/delve/delve.docbook +++ b/bin/delv/delv.docbook @@ -17,20 +17,20 @@ - PERFORMANCE OF THIS SOFTWARE. --> - + - February 21, 2014 + April 23, 2014 - delve + delv 1 BIND9 - delve + delv DNS lookup and validation utility @@ -43,7 +43,7 @@ - delve + delv @server @@ -64,17 +64,17 @@ - delve + delv - delve + delv - delve + delv queryopt query @@ -82,13 +82,13 @@ DESCRIPTION - delve - (Domain Entity Lookup & Validation Engine) is a tool for sending + delv + (Domain Entity Lookup & Validation) is a tool for sending DNS queries and validating the results, using the the same internal resolver and validator logic as named. - delve will send to a specified name server all + delv 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 - delve are either fully validated or + delv 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 delve does + can be traced in detail. Because delv 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. Unless it is told to query a specific name server, - delve will try each of the servers listed in + delv will try each of the servers listed in /etc/resolv.conf. If no usable server - addresses are found, delve will send + addresses are found, delv will send queries to the localhost addresses (127.0.0.1 for IPv4, ::1 for IPv6). When no command line arguments or options are given, - delve will perform an NS query for "." + delv will perform an NS query for "." (the root zone). @@ -128,8 +128,8 @@ SIMPLE USAGE - A typical invocation of delve looks like: - delve @server name type + A typical invocation of delv looks like: + delv @server name type where: @@ -141,21 +141,21 @@ can be an IPv4 address in dotted-decimal notation or an IPv6 address in colon-delimited notation. When the supplied server argument is a hostname, - delve resolves that name before + delv resolves that name before querying that name server (note, however, that this initial lookup is not validated by DNSSEC). If no server argument is - provided, delve consults + provided, delv consults /etc/resolv.conf; if an address is found there, it queries the name server at that address. If either of the or options are in use, then only addresses for the corresponding transport will be tried. If no usable addresses are found, - delve will send queries to + delv will send queries to the localhost addresses (127.0.0.1 for IPv4, ::1 for IPv6). @@ -180,7 +180,7 @@ type can be any valid query type. If no type argument is supplied, - delve will perform a lookup for an + delv will perform a lookup for an A record. @@ -213,17 +213,17 @@ Note: When reading the trust anchor file, - delve treats + delv treats statements and statements identically. That is, for a managed key, it is the initial key that is trusted; RFC 5011 - key management is not supported. delve + key management is not supported. delv will not consult the managed-keys database maintained by named. This means that if either of the keys in /etc/bind.keys is revoked and rolled over, it will be necessary to update /etc/bind.keys to use DNSSEC - validation in delve. + validation in delv. @@ -246,7 +246,7 @@ Sets the query class for the requested data. Currently, - only class "IN" is supported in delve + only class "IN" is supported in delv and any other value is ignored. @@ -259,7 +259,7 @@ Set the systemwide debug level to . The allowed range is from 0 to 99. The default is 0 (no debugging). - Debugging traces from delve become + Debugging traces from delv become more verbose as the debug level increases. See the , , and options below for additional @@ -272,7 +272,7 @@ -h - Display the delve help usage output and exit. + Display the delv help usage output and exit. @@ -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 delve to time out. When it + can cause delv to time out. When it is necessary to examine invalid data to debug a DNSSEC problem, use dig +cd.) @@ -350,7 +350,7 @@ -v - Print the delve version and exit. + Print the delv version and exit. @@ -364,7 +364,7 @@ dotted-decimal notation, or a colon-delimited IPv6 address. When is used, there is no need to provide the name or type - arguments. delve automatically performs a + arguments. delv automatically performs a lookup for a name like 11.12.13.10.in-addr.arpa and sets the query type to PTR. IPv6 addresses are looked up using nibble format under the IP6.ARPA domain. @@ -376,7 +376,7 @@ -4 - Forces delve to only use IPv4. + Forces delv to only use IPv4. @@ -385,7 +385,7 @@ -6 - Forces delve to only use IPv6. + Forces delv to only use IPv6. @@ -396,7 +396,7 @@ QUERY OPTIONS - delve + delv provides a number of query options which affect the way results are displayed, and in some cases the way lookups are performed. @@ -416,12 +416,12 @@ Controls whether to set the CD (checking disabled) bit in - queries sent by delve. This may be useful + queries sent by delv. 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 delve can then + invalid responses, which delv can then validate internally and report the errors in detail. @@ -452,7 +452,7 @@ Toggle resolver fetch logging. This reports the - name and type of each query sent by delve + name and type of each query sent by delv 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 @@ Toggle message logging. This produces a detailed dump of - the responses received by delve in the + the responses received by delv in the process of carrying out the resolution and validation process. @@ -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 delve + facilitate machine parsing of the delv output. @@ -606,7 +606,7 @@ Indicates whether to display RRSIG records in the - delve output. The default is to + delv output. The default is to do so. Note that (unlike in dig) this does not control whether to request DNSSEC records or whether to validate them. diff --git a/bin/delve/delve.html b/bin/delv/delv.html similarity index 100% rename from bin/delve/delve.html rename to bin/delv/delv.html diff --git a/bin/delve/win32/delve.dsp.in b/bin/delv/win32/delv.dsp.in similarity index 86% rename from bin/delve/win32/delve.dsp.in rename to bin/delv/win32/delv.dsp.in index 624679792b0..ce1fea143a2 100644 --- a/bin/delve/win32/delve.dsp.in +++ b/bin/delv/win32/delv.dsp.in @@ -1,24 +1,24 @@ -# 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" diff --git a/bin/delve/win32/delve.dsw b/bin/delv/win32/delv.dsw similarity index 89% rename from bin/delve/win32/delve.dsw rename to bin/delv/win32/delv.dsw index 79cda30f9b4..e45fea55bc7 100644 --- a/bin/delve/win32/delve.dsw +++ b/bin/delv/win32/delv.dsw @@ -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> {{{ diff --git a/bin/delve/win32/delve.mak.in b/bin/delv/win32/delv.mak.in similarity index 75% rename from bin/delve/win32/delve.mak.in rename to bin/delv/win32/delv.mak.in index 5ddda129129..b7dd060f676 100644 --- a/bin/delve/win32/delve.mak.in +++ b/bin/delv/win32/delv.mak.in @@ -1,20 +1,20 @@ -# 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" LINK32_OBJS= \ - "$(INTDIR)\delve.obj" + "$(INTDIR)\delv.obj" -"..\..\..\Build\Release\delve.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) +"..\..\..\Build\Release\delv.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << $(_VC_MANIFEST_EMBED_EXE) -!ELSEIF "$(CFG)" == "delve - @PLATFORM@ Debug" +!ELSEIF "$(CFG)" == "delv - @PLATFORM@ Debug" OUTDIR=.\Debug INTDIR=.\Debug @@ -174,18 +174,18 @@ INTDIR=.\Debug OutDir=.\Debug # End Custom Macros -ALL : "..\..\..\Build\Debug\delve.exe" "$(OUTDIR)\delve.bsc" +ALL : "..\..\..\Build\Debug\delv.exe" "$(OUTDIR)\delv.bsc" CLEAN : - -@erase "$(INTDIR)\delve.obj" - -@erase "$(INTDIR)\delve.sbr" + -@erase "$(INTDIR)\delv.obj" + -@erase "$(INTDIR)\delv.sbr" -@erase "$(INTDIR)\vc60.idb" -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\delve.pdb" - -@erase "$(OUTDIR)\delve.bsc" - -@erase "..\..\..\Build\Debug\delve.exe" - -@erase "..\..\..\Build\Debug\delve.ilk" + -@erase "$(OUTDIR)\delv.pdb" + -@erase "$(OUTDIR)\delv.bsc" + -@erase "..\..\..\Build\Debug\delv.exe" + -@erase "..\..\..\Build\Debug\delv.ilk" -@$(_VC_MANIFEST_CLEAN) "$(OUTDIR)" : @@ -226,21 +226,21 @@ CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "../../../" @LIBXML2_IN RSC=rc.exe BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\delve.bsc" +BSC32_FLAGS=/nologo /o"$(OUTDIR)\delv.bsc" BSC32_SBRS= \ - "$(INTDIR)\delve.sbr" + "$(INTDIR)\delv.sbr" -"$(OUTDIR)\delve.bsc" : "$(OUTDIR)" $(BSC32_SBRS) +"$(OUTDIR)\delv.bsc" : "$(OUTDIR)" $(BSC32_SBRS) $(BSC32) @<< $(BSC32_FLAGS) $(BSC32_SBRS) << LINK32=link.exe -LINK32_FLAGS=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 /incremental:yes /pdb:"$(OUTDIR)\delve.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/delve.exe" /pdbtype:sept +LINK32_FLAGS=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 /incremental:yes /pdb:"$(OUTDIR)\delv.pdb" /debug @MACHINE@ /out:"../../../Build/Debug/delv.exe" /pdbtype:sept LINK32_OBJS= \ - "$(INTDIR)\delve.obj" + "$(INTDIR)\delv.obj" -"..\..\..\Build\Debug\delve.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) +"..\..\..\Build\Debug\delv.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << @@ -250,28 +250,28 @@ LINK32_OBJS= \ !IF "$(NO_EXTERNAL_DEPS)" != "1" -!IF EXISTS("delve.dep") -!INCLUDE "delve.dep" +!IF EXISTS("delv.dep") +!INCLUDE "delv.dep" !ELSE -!MESSAGE Warning: cannot find "delve.dep" +!MESSAGE Warning: cannot find "delv.dep" !ENDIF !ENDIF -!IF "$(CFG)" == "delve - @PLATFORM@ Release" || "$(CFG)" == "delve - @PLATFORM@ Debug" -SOURCE="..\delve.c" +!IF "$(CFG)" == "delv - @PLATFORM@ Release" || "$(CFG)" == "delv - @PLATFORM@ Debug" +SOURCE="..\delv.c" -!IF "$(CFG)" == "delve - @PLATFORM@ Release" +!IF "$(CFG)" == "delv - @PLATFORM@ Release" -"$(INTDIR)\delve.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\delv.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -!ELSEIF "$(CFG)" == "delve - @PLATFORM@ Debug" +!ELSEIF "$(CFG)" == "delv - @PLATFORM@ Debug" -"$(INTDIR)\delve.obj" "$(INTDIR)\delve.sbr" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\delv.obj" "$(INTDIR)\delv.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) diff --git a/bin/delve/win32/delve.vcxproj.filters.in b/bin/delv/win32/delv.vcsproj.filters.in similarity index 92% rename from bin/delve/win32/delve.vcxproj.filters.in rename to bin/delv/win32/delv.vcsproj.filters.in index 6e0337ec316..f5a91e9e17f 100644 --- a/bin/delve/win32/delve.vcxproj.filters.in +++ b/bin/delv/win32/delv.vcsproj.filters.in @@ -15,8 +15,8 @@ - + Source Files - \ No newline at end of file + diff --git a/bin/delve/win32/delve.vcxproj.in b/bin/delv/win32/delv.vcxproj.in similarity index 97% rename from bin/delve/win32/delve.vcxproj.in rename to bin/delv/win32/delv.vcxproj.in index f8671c9d6e3..381cc541e59 100644 --- a/bin/delve/win32/delve.vcxproj.in +++ b/bin/delv/win32/delv.vcxproj.in @@ -13,7 +13,7 @@ {BE172EFE-C1DC-4812-BFB9-8C5F8ADB7E9F} Win32Proj - delve + delv @@ -100,9 +100,9 @@ - + - \ No newline at end of file + diff --git a/bin/delve/win32/delve.vcxproj.user b/bin/delv/win32/delv.vcxproj.user similarity index 100% rename from bin/delve/win32/delve.vcxproj.user rename to bin/delv/win32/delv.vcxproj.user diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 4ed28fedeb4..0f99ef42ac3 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -15,8 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: conf.sh.in,v 1.71 2011/12/05 17:10:50 each Exp $ - # # Common configuration data for system tests, to be sourced into # other shell scripts. @@ -33,7 +31,7 @@ NAMED=$TOP/bin/named/named # if the program is libtoolized. LWRESD="$TOP/bin/named/named -l" DIG=$TOP/bin/dig/dig -DELVE=$TOP/bin/delve/delve +DELV=$TOP/bin/delv/delv RNDC=$TOP/bin/rndc/rndc NSUPDATE=$TOP/bin/nsupdate/nsupdate DDNSCONFGEN=$TOP/bin/confgen/ddns-confgen diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh index 45724c8614d..e9b6f3101be 100644 --- a/bin/tests/system/dnssec/clean.sh +++ b/bin/tests/system/dnssec/clean.sh @@ -30,7 +30,7 @@ rm -f ns2/nsec3chain-test.db rm -f */example.bk rm -f dig.out.* rm -f rndc.out.* -rm -f delve.out* +rm -f delv.out* rm -f ns2/dlv.db rm -f ns3/multiple.example.db ns3/nsec3-unknown.example.db ns3/nsec3.example.db rm -f ns3/optout-unknown.example.db ns3/optout.example.db diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index a83266c80ed..5cafdb26aed 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -26,7 +26,7 @@ n=1 rm -f dig.out.* DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p 5300" -DELVEOPTS="-a ns1/trusted.conf -p 5300" +DELVOPTS="-a ns1/trusted.conf -p 5300" # convert private-type records to readable form showprivate () { @@ -137,12 +137,12 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking postive validation NSEC using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a a.example > delve.out$n || ret=1 - grep "a.example..*10.0.0.1" delve.out$n > /dev/null || ret=1 - grep "a.example..*.RRSIG.A 3 2 300 .*" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a a.example > delv.out$n || ret=1 + grep "a.example..*10.0.0.1" delv.out$n > /dev/null || ret=1 + grep "a.example..*.RRSIG.A 3 2 300 .*" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -160,12 +160,12 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking positive validation NSEC3 using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a a.nsec3.example > delve.out$n || ret=1 - grep "a.nsec3.example..*10.0.0.1" delve.out$n > /dev/null || ret=1 - grep "a.nsec3.example..*RRSIG.A 7 3 300.*" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a a.nsec3.example > delv.out$n || ret=1 + grep "a.nsec3.example..*10.0.0.1" delv.out$n > /dev/null || ret=1 + grep "a.nsec3.example..*RRSIG.A 7 3 300.*" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -183,12 +183,12 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking positive validation OPTOUT using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a a.optout.example > delve.out$n || ret=1 - grep "a.optout.example..*10.0.0.1" delve.out$n > /dev/null || ret=1 - grep "a.optout.example..*RRSIG.A 7 3 300.*" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a a.optout.example > delv.out$n || ret=1 + grep "a.optout.example..*10.0.0.1" delv.out$n > /dev/null || ret=1 + grep "a.optout.example..*RRSIG.A 7 3 300.*" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -209,12 +209,12 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking positive wildcard validation NSEC using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a a.wild.example > delve.out$n || ret=1 - grep "a.wild.example..*10.0.0.27" delve.out$n > /dev/null || ret=1 - grep "a.wild.example..*RRSIG.A 3 2 300.*" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a a.wild.example > delv.out$n || ret=1 + grep "a.wild.example..*10.0.0.27" delv.out$n > /dev/null || ret=1 + grep "a.wild.example..*RRSIG.A 3 2 300.*" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -251,12 +251,12 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking positive wildcard validation NSEC3 using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a a.wild.nsec3.example > delve.out$n || ret=1 - grep "a.wild.nsec3.example..*10.0.0.6" delve.out$n > /dev/null || ret=1 - grep "a.wild.nsec3.example..*RRSIG.A 7 3 300.*" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a a.wild.nsec3.example > delv.out$n || ret=1 + grep "a.wild.nsec3.example..*10.0.0.6" delv.out$n > /dev/null || ret=1 + grep "a.wild.nsec3.example..*RRSIG.A 7 3 300.*" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -277,12 +277,12 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking positive wildcard validation OPTOUT using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a a.wild.optout.example > delve.out$n || ret=1 - grep "a.wild.optout.example..*10.0.0.6" delve.out$n > /dev/null || ret=1 - grep "a.wild.optout.example..*RRSIG.A 7 3 300.*" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a a.wild.optout.example > delv.out$n || ret=1 + grep "a.wild.optout.example..*10.0.0.6" delv.out$n > /dev/null || ret=1 + grep "a.wild.optout.example..*RRSIG.A 7 3 300.*" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -299,11 +299,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking negative validation NXDOMAIN NSEC using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a q.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxdomain" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a q.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxdomain" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -322,11 +322,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking negative validation NXDOMAIN NSEC3 using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a q.nsec3.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxdomain" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a q.nsec3.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxdomain" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -346,11 +346,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking negative validation NXDOMAIN OPTOUT using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a q.optout.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxdomain" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a q.optout.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxdomain" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -368,11 +368,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking negative validation NODATA OPTOUT using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 txt a.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxrrset" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 txt a.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxrrset" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -392,11 +392,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking negative validation NODATA NSEC3 using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 txt a.nsec3.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxrrset" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 txt a.nsec3.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxrrset" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -416,11 +416,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking negative validation NODATA OPTOUT using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 txt a.optout.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxrrset" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 txt a.optout.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxrrset" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -437,11 +437,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking negative wildcard validation NSEC using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 txt b.wild.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxrrset" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 txt b.wild.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxrrset" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -457,11 +457,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking negative wildcard validation NSEC3 using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 txt b.wild.nsec3.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxrrset" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 txt b.wild.nsec3.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxrrset" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -481,11 +481,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking negative wildcard validation OPTOUT using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 txt b.optout.nsec3.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxrrset" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 txt b.optout.nsec3.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxrrset" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -505,11 +505,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking 1-server insecurity proof NSEC using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a a.insecure.example > delve.out$n || ret=1 - grep "a.insecure.example..*10.0.0.1" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a a.insecure.example > delv.out$n || ret=1 + grep "a.insecure.example..*10.0.0.1" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -527,11 +527,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking 1-server insecurity proof NSEC3 using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a a.insecure.nsec3.example > delve.out$n || ret=1 - grep "a.insecure.nsec3.example..*10.0.0.1" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a a.insecure.nsec3.example > delv.out$n || ret=1 + grep "a.insecure.nsec3.example..*10.0.0.1" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -549,11 +549,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking 1-server insecurity proof OPTOUT using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a a.insecure.optout.example > delve.out$n || ret=1 - grep "a.insecure.optout.example..*10.0.0.1" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a a.insecure.optout.example > delv.out$n || ret=1 + grep "a.insecure.optout.example..*10.0.0.1" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -573,11 +573,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking 1-server negative insecurity proof NSEC using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a q.insecure.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxdomain" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a q.insecure.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxdomain" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -597,11 +597,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking 1-server negative insecurity proof NSEC3 using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a q.insecure.nsec3.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxdomain" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a q.insecure.nsec3.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxdomain" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -621,11 +621,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking 1-server negative insecurity proof OPTOUT using dns_client ($n)" - $DELVE $DELVEOPTS @10.53.0.4 a q.insecure.optout.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: ncache nxdomain" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS @10.53.0.4 a q.insecure.optout.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: ncache nxdomain" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -818,11 +818,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking failed validation using dns_client ($n)" - $DELVE $DELVEOPTS +cd @10.53.0.4 a a.bogus.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: RRSIG failed to verify" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS +cd @10.53.0.4 a a.bogus.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: RRSIG failed to verify" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -863,11 +863,11 @@ n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` -if [ -x ${DELVE} ] ; then +if [ -x ${DELV} ] ; then ret=0 echo "I:checking that validation fails when key record is missing using dns_client ($n)" - $DELVE $DELVEOPTS +cd @10.53.0.4 a a.b.keyless.example > delve.out$n 2>&1 || ret=1 - grep "resolution failed: broken trust chain" delve.out$n > /dev/null || ret=1 + $DELV $DELVOPTS +cd @10.53.0.4 a a.b.keyless.example > delv.out$n 2>&1 || ret=1 + grep "resolution failed: broken trust chain" delv.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp index 5d2ed88e3f4..72beddb0485 100644 --- a/bin/win32/BINDInstall/BINDInstallDlg.cpp +++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp @@ -165,7 +165,7 @@ const FileData installFiles[] = {"dig.exe", FileData::BinDir, FileData::Normal, FALSE, TRUE}, {"host.exe", FileData::BinDir, FileData::Normal, FALSE, TRUE}, {"nslookup.exe", FileData::BinDir, FileData::Normal, FALSE, TRUE}, - {"delve.exe", FileData::BinDir, FileData::Normal, FALSE, TRUE}, + {"delv.exe", FileData::BinDir, FileData::Normal, FALSE, TRUE}, {"arpaname.exe", FileData::BinDir, FileData::Normal, FALSE, TRUE}, {"nsec3hash.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE}, {"genrandom.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE}, diff --git a/configure b/configure index b49b54f7629..ee3c490a037 100755 --- a/configure +++ b/configure @@ -21391,7 +21391,7 @@ ac_config_commands="$ac_config_commands chmod" # elsewhere if there's a good reason for doing so. # -ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delve/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dlzredir/prereq.sh bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/sit/prereq.sh bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/system/tsiggss/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-docbook-latex.xsl doc/xsl/isc-manpage.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh" +ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/named.conf bin/tests/system/dlzredir/prereq.sh bin/tests/system/filter-aaaa/Makefile bin/tests/system/geoip/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/sit/prereq.sh bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/system/tsiggss/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-docbook-latex.xsl doc/xsl/isc-manpage.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh" # @@ -22392,7 +22392,7 @@ do "bin/check/Makefile") CONFIG_FILES="$CONFIG_FILES bin/check/Makefile" ;; "bin/confgen/Makefile") CONFIG_FILES="$CONFIG_FILES bin/confgen/Makefile" ;; "bin/confgen/unix/Makefile") CONFIG_FILES="$CONFIG_FILES bin/confgen/unix/Makefile" ;; - "bin/delve/Makefile") CONFIG_FILES="$CONFIG_FILES bin/delve/Makefile" ;; + "bin/delv/Makefile") CONFIG_FILES="$CONFIG_FILES bin/delv/Makefile" ;; "bin/dig/Makefile") CONFIG_FILES="$CONFIG_FILES bin/dig/Makefile" ;; "bin/dnssec/Makefile") CONFIG_FILES="$CONFIG_FILES bin/dnssec/Makefile" ;; "bin/named/Makefile") CONFIG_FILES="$CONFIG_FILES bin/named/Makefile" ;; diff --git a/configure.in b/configure.in index 16375105456..43de6e6ebc9 100644 --- a/configure.in +++ b/configure.in @@ -4331,7 +4331,7 @@ AC_CONFIG_FILES([ bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile - bin/delve/Makefile + bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index 81a3d7d61f5..0daf19a0607 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -17667,7 +17667,7 @@ zone "example.com" { Manual pages - + diff --git a/doc/arm/man.delve.html b/doc/arm/man.delv.html similarity index 100% rename from doc/arm/man.delve.html rename to doc/arm/man.delv.html diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in index c61f8bf697d..ca7d3606de1 100644 --- a/lib/isc/win32/libisc.vcxproj.in +++ b/lib/isc/win32/libisc.vcxproj.in @@ -182,7 +182,7 @@ copy ..\bin\named\named.html ..\Build\Release copy ..\bin\rndc\*.html ..\Build\Release copy ..\bin\confgen\*.html ..\Build\Release copy ..\bin\dig\*.html ..\Build\Release -copy ..\bin\delve\*.html ..\Build\Release +copy ..\bin\delv\*.html ..\Build\Release copy ..\bin\nsupdate\*.html ..\Build\Release copy ..\bin\check\*.html ..\Build\Release copy ..\bin\dnssec\dnssec-keygen.html ..\Build\Release diff --git a/lib/samples/.gitignore b/lib/samples/.gitignore index bfe33a230cf..b132e890607 100644 --- a/lib/samples/.gitignore +++ b/lib/samples/.gitignore @@ -1,5 +1,4 @@ Makefile-postinstall -delve nsprobe process resolve diff --git a/util/copyrights b/util/copyrights index 264201f6ab7..6be4e3b0717 100644 --- a/util/copyrights +++ b/util/copyrights @@ -74,17 +74,17 @@ ./bin/confgen/win32/rndcconfgen.vcxproj.filters.in X 2013 ./bin/confgen/win32/rndcconfgen.vcxproj.in X 2013 ./bin/confgen/win32/rndcconfgen.vcxproj.user X 2013 -./bin/delve/Makefile.in MAKE 2014 -./bin/delve/delve.1 MAN 2014 -./bin/delve/delve.c C 2014 -./bin/delve/delve.docbook SGML 2014 -./bin/delve/delve.html HTML 2014 -./bin/delve/win32/delve.dsp.in X 2014 -./bin/delve/win32/delve.dsw X 2014 -./bin/delve/win32/delve.mak.in X 2014 -./bin/delve/win32/delve.vcxproj.filters.in X 2014 -./bin/delve/win32/delve.vcxproj.in X 2014 -./bin/delve/win32/delve.vcxproj.user X 2014 +./bin/delv/Makefile.in MAKE 2014 +./bin/delv/delv.1 MAN 2014 +./bin/delv/delv.c C 2014 +./bin/delv/delv.docbook SGML 2014 +./bin/delv/delv.html HTML 2014 +./bin/delv/win32/delv.dsp.in X 2014 +./bin/delv/win32/delv.dsw X 2014 +./bin/delv/win32/delv.mak.in X 2014 +./bin/delv/win32/delv.vcxproj.filters.in X 2014 +./bin/delv/win32/delv.vcxproj.in X 2014 +./bin/delv/win32/delv.vcxproj.user X 2014 ./bin/dig/.gitignore X 2012 ./bin/dig/Makefile.in MAKE 2000,2001,2002,2004,2005,2007,2009,2012,2013,2014 ./bin/dig/dig.1 MAN DOCBOOK @@ -2745,7 +2745,7 @@ ./doc/arm/libdns.xml SGML 2010 ./doc/arm/man.arpaname.html X 2009,2010,2011,2012,2013,2014 ./doc/arm/man.ddns-confgen.html X 2009,2010,2011,2012,2013,2014 -./doc/arm/man.delve.html X 2014 +./doc/arm/man.delv.html X 2014 ./doc/arm/man.dig.html X 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014 ./doc/arm/man.dnssec-checkds.html X 2013,2014 ./doc/arm/man.dnssec-coverage.html X 2013,2014 diff --git a/win32utils/Configure b/win32utils/Configure index f4dc3bd781d..3aac50c518e 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -40,8 +40,8 @@ my @filelist = ("..\\bin\\check\\win32\\checktool.dsp", "..\\bin\\confgen\\win32\\ddnsconfgen.mak", "..\\bin\\confgen\\win32\\rndcconfgen.dsp", "..\\bin\\confgen\\win32\\rndcconfgen.mak", - "..\\bin\\delve\\win32\\delve.dsp", - "..\\bin\\delve\\win32\\delve.mak", + "..\\bin\\delv\\win32\\delv.dsp", + "..\\bin\\delv\\win32\\delv.mak", "..\\bin\\dig\\win32\\dig.dsp", "..\\bin\\dig\\win32\\dig.mak", "..\\bin\\dig\\win32\\dighost.dsp", @@ -198,8 +198,8 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj", "..\\bin\\confgen\\win32\\ddnsconfgen.vcxproj.filters", "..\\bin\\confgen\\win32\\rndcconfgen.vcxproj", "..\\bin\\confgen\\win32\\rndcconfgen.vcxproj.filters", - "..\\bin\\delve\\win32\\delve.vcxproj", - "..\\bin\\delve\\win32\\delve.vcxproj.filters", + "..\\bin\\delv\\win32\\delv.vcxproj", + "..\\bin\\delv\\win32\\delv.vcxproj.filters", "..\\bin\\dig\\win32\\dig.vcxproj", "..\\bin\\dig\\win32\\dig.vcxproj.filters", "..\\bin\\dig\\win32\\dighost.vcxproj", diff --git a/win32utils/bind9.sln.in b/win32utils/bind9.sln.in index 5223c97e022..c6145739a85 100644 --- a/win32utils/bind9.sln.in +++ b/win32utils/bind9.sln.in @@ -276,7 +276,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nslookup", "..\bin\dig\win3 {140DE800-E552-43CC-B0C7-A33A92E368CA} = {140DE800-E552-43CC-B0C7-A33A92E368CA} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "delve", "..\bin\delve\win32\delve.vcxproj", "{BE172EFE-C1DC-4812-BFB9-8C5F8ADB7E9F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "delv", "..\bin\delv\win32\delv.vcxproj", "{BE172EFE-C1DC-4812-BFB9-8C5F8ADB7E9F}" ProjectSection(ProjectDependencies) = postProject {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} diff --git a/win32utils/legacy/BINDBuild.dsw.in b/win32utils/legacy/BINDBuild.dsw.in index d312465ecdd..7ef7fdd453b 100644 --- a/win32utils/legacy/BINDBuild.dsw.in +++ b/win32utils/legacy/BINDBuild.dsw.in @@ -373,7 +373,7 @@ Package=<4> ############################################################################### -Project: "delve"="..\..\bin\delve\win32\delve.dsp" - Package Owner=<4> +Project: "delv"="..\..\bin\delv\win32\delv.dsp" - Package Owner=<4> Package=<5> {{{ diff --git a/win32utils/legacy/BuildAll.bat.in b/win32utils/legacy/BuildAll.bat.in index 772219ac5f8..c559c7f19e7 100644 --- a/win32utils/legacy/BuildAll.bat.in +++ b/win32utils/legacy/BuildAll.bat.in @@ -116,8 +116,8 @@ nmake /nologo /nologo -f host.mak CFG="host - @PLATFORM@ Release" NO_EXTERNAL_D nmake /nologo -f nslookup.mak CFG="nslookup - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" cd ..\.. -cd delve\win32 -nmake /nologo -f delve.mak CFG="delve - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" +cd delv\win32 +nmake /nologo -f delv.mak CFG="delv - @PLATFORM@ Release" NO_EXTERNAL_DEPS="1" cd ..\.. cd nsupdate\win32 diff --git a/win32utils/legacy/BuildSetup.bat.in b/win32utils/legacy/BuildSetup.bat.in index 41431ce5628..606d1a2dc47 100644 --- a/win32utils/legacy/BuildSetup.bat.in +++ b/win32utils/legacy/BuildSetup.bat.in @@ -56,7 +56,7 @@ copy ..\..\bin\named\named.html ..\..\Build\Release copy ..\..\bin\rndc\*.html ..\..\Build\Release copy ..\..\bin\confgen\*.html ..\..\Build\Release copy ..\..\bin\dig\*.html ..\..\Build\Release -copy ..\..\bin\delve\*.html ..\..\Build\Release +copy ..\..\bin\delv\*.html ..\..\Build\Release copy ..\..\bin\nsupdate\*.html ..\..\Build\Release copy ..\..\bin\check\*.html ..\..\Build\Release copy ..\..\bin\dnssec\dnssec-keygen.html ..\..\Build\Release