diff -Naur bind8-8.4.7/src/bin/addr/addr.c bind8-8.4.7.oden/src/bin/addr/addr.c
--- bind8-8.4.7/src/bin/addr/addr.c 2004-01-16 03:01:21.000000000 +0100
+++ bind8-8.4.7.oden/src/bin/addr/addr.c 2005-12-21 07:45:04.000000000 +0100
@@ -33,7 +33,7 @@
#include <unistd.h>
#include "port_after.h"
-static const char *prog = "addr";
+static const char *prog = "addr8";
#define BIGGEST_ADDRESS IN6ADDRSZ
diff -Naur bind8-8.4.7/src/bin/dig/dig.c bind8-8.4.7.oden/src/bin/dig/dig.c
--- bind8-8.4.7/src/bin/dig/dig.c 2005-10-11 01:54:29.000000000 +0200
+++ bind8-8.4.7.oden/src/bin/dig/dig.c 2005-12-21 07:46:02.000000000 +0100
@@ -369,7 +369,7 @@
}
} else {
if (ax - args == DIG_MAXARGS) {
- fprintf(stderr, "dig: too many arguments\n");
+ fprintf(stderr, "dig8: too many arguments\n");
exit(10);
}
*ax++ = *vtmp;
@@ -413,7 +413,7 @@
*pingstr = 0;
srv = NULL;
- sprintf(cmd, "\n; <<>> DiG %s <<>> ", VSTRING);
+ sprintf(cmd, "\n; <<>> DiG8 %s <<>> ", VSTRING);
argv = args;
/* argc = ax - args; */
/*
@@ -998,7 +998,7 @@
static void
Usage() {
fputs("\
-usage: dig [@server] [domain] [q-type] [q-class] {q-opt} {d-opt} [%comment]\n\
+usage: dig8 [@server] [domain] [q-type] [q-class] {q-opt} {d-opt} [%comment]\n\
where: server,\n\
domain are names in the Domain Name System\n\
q-class is one of (in,any,...) [default: in]\n\
@@ -1029,7 +1029,7 @@
", stderr);
fputs("\
notes: defname and search don't work; use fully-qualified names.\n\
- this is DiG version " VSTRING "\n\
+ this is DiG8 version " VSTRING "\n\
$Id: dig.c,v 8.78 2005/10/10 23:54:29 marka Exp $\n\
", stderr);
}
diff -Naur bind8-8.4.7/src/bin/irpd/version.c bind8-8.4.7.oden/src/bin/irpd/version.c
--- bind8-8.4.7/src/bin/irpd/version.c 2004-01-16 03:01:21.000000000 +0100
+++ bind8-8.4.7.oden/src/bin/irpd/version.c 2005-12-21 07:45:04.000000000 +0100
@@ -16,10 +16,10 @@
*/
#ifndef lint
-char sccsid[] = "@(#)named %VERSION% %WHEN% %WHOANDWHERE%";
+char sccsid[] = "@(#)named8 %VERSION% %WHEN% %WHOANDWHERE%";
char rcsid[] = "$Id: version.c,v 1.2 2004/01/16 02:01:21 vixie Exp $";
#endif /* not lint */
-char Version[] = "named %VERSION% %WHEN%\n\t%WHOANDWHERE%";
+char Version[] = "named8 %VERSION% %WHEN%\n\t%WHOANDWHERE%";
char ShortVersion[] = "%VERSION%";
diff -Naur bind8-8.4.7/src/bin/named/ns_main.c bind8-8.4.7.oden/src/bin/named/ns_main.c
--- bind8-8.4.7/src/bin/named/ns_main.c 2005-10-11 06:55:33.000000000 +0200
+++ bind8-8.4.7.oden/src/bin/named/ns_main.c 2005-12-21 07:45:04.000000000 +0100
@@ -250,7 +250,7 @@
static void
usage() {
fprintf(stderr,
-"Usage: named [-d #] [-q] [-r] [-v] [-f] [-p port] [[-b|-c] configfile]\n");
+"Usage: named8 [-d #] [-q] [-r] [-v] [-f] [-p port] [[-b|-c] configfile]\n");
#ifdef CAN_CHANGE_ID
fprintf(stderr,
" [-u (username|uid)] [-g (groupname|gid)]\n");
@@ -508,9 +508,9 @@
n |= LOG_CONS;
#endif
#ifdef SYSLOG_42BSD
- openlog("named", n);
+ openlog("named8", n);
#else
- openlog("named", n, ISC_FACILITY);
+ openlog("named8", n, ISC_FACILITY);
#endif
init_logging();
@@ -604,9 +604,9 @@
INSIST_ERR(errno == EINTR);
}
if (needs_restart)
- ns_info(ns_log_default, "named restarting");
+ ns_info(ns_log_default, "named8 restarting");
else
- ns_info(ns_log_default, "named shutting down");
+ ns_info(ns_log_default, "named8 shutting down");
#ifdef BIND_UPDATE
dynamic_about_to_exit();
#endif
diff -Naur bind8-8.4.7/src/bin/named/pathtemplate.h bind8-8.4.7.oden/src/bin/named/pathtemplate.h
--- bind8-8.4.7/src/bin/named/pathtemplate.h 2004-01-16 03:01:25.000000000 +0100
+++ bind8-8.4.7.oden/src/bin/named/pathtemplate.h 2005-12-21 07:45:04.000000000 +0100
@@ -22,7 +22,7 @@
#include <paths.h>
#ifndef _PATH_CONF
-#define _PATH_CONF "%DESTETC%/named.conf"
+#define _PATH_CONF "%DESTETC%/named8.conf"
#endif
#ifndef _PATH_DEBUG
@@ -34,18 +34,18 @@
#endif
#ifndef _PATH_NAMED
-#define _PATH_NAMED "%DESTSBIN%/named"
+#define _PATH_NAMED "%DESTSBIN%/named8"
#endif
#ifndef _PATH_PIDFILE
-#define _PATH_PIDFILE "%DESTRUN%/named.pid"
+#define _PATH_PIDFILE "%DESTRUN%/named8.pid"
#endif
#ifndef _PATH_NDCSOCK
#ifdef NEED_SECURE_DIRECTORY
#define _PATH_NDCSOCK "%DESTRUN%/ndc.d/ndc"
#else
-#define _PATH_NDCSOCK "%DESTRUN%/ndc"
+#define _PATH_NDCSOCK "%DESTRUN%/ndc8"
#endif
#endif
@@ -62,7 +62,7 @@
#endif
#ifndef _PATH_XFER
-#define _PATH_XFER "%DESTEXEC%/named-xfer"
+#define _PATH_XFER "%DESTEXEC%/named-xfer8"
#endif
#ifndef _PATH_XFERTRACE
diff -Naur bind8-8.4.7/src/bin/named/version.c bind8-8.4.7.oden/src/bin/named/version.c
--- bind8-8.4.7/src/bin/named/version.c 1999-01-02 07:05:14.000000000 +0100
+++ bind8-8.4.7.oden/src/bin/named/version.c 2005-12-21 07:45:04.000000000 +0100
@@ -4,11 +4,11 @@
*/
#ifndef lint
-char sccsid[] = "@(#)named %VERSION% %WHEN% %WHOANDWHERE%";
+char sccsid[] = "@(#)named8 %VERSION% %WHEN% %WHOANDWHERE%";
char rcsid[] = "$Id: version.c,v 8.3 1999/01/02 06:05:14 vixie Exp $";
#endif /* not lint */
-char Version[] = "named %VERSION% %WHEN%\n\t%WHOANDWHERE%";
+char Version[] = "named8 %VERSION% %WHEN%\n\t%WHOANDWHERE%";
char ShortVersion[] = "%VERSION%";
#ifdef COMMENT
diff -Naur bind8-8.4.7/src/bin/named-xfer/named-xfer.c bind8-8.4.7.oden/src/bin/named-xfer/named-xfer.c
--- bind8-8.4.7/src/bin/named-xfer/named-xfer.c 2005-10-11 01:54:38.000000000 +0200
+++ bind8-8.4.7.oden/src/bin/named-xfer/named-xfer.c 2005-12-21 07:45:04.000000000 +0100
@@ -3306,7 +3306,7 @@
pbuf, sizeof(pbuf),
NI_NUMERICHOST|NI_NUMERICSERV) == 0);
fprintf(file,
- "[IXFR_UPDATE] id %u from [%s].%s %s (named-xfer pid %ld):\n",
+ "[IXFR_UPDATE] id %u from [%s].%s %s (named-xfer8 pid %ld):\n",
id, hbuf, pbuf, time, (long)getpid());
(*first_rr)++;
}
diff -Naur bind8-8.4.7/src/bin/nslookup/main.c bind8-8.4.7.oden/src/bin/nslookup/main.c
--- bind8-8.4.7/src/bin/nslookup/main.c 2004-01-16 03:01:25.000000000 +0100
+++ bind8-8.4.7.oden/src/bin/nslookup/main.c 2005-12-21 07:45:04.000000000 +0100
@@ -467,13 +467,13 @@
Usage(void) {
fprintf(stderr, "Usage:\n");
fprintf(stderr,
-" nslookup [-opt ...] # interactive mode using default server\n");
+" nslookup8 [-opt ...] # interactive mode using default server\n");
fprintf(stderr,
-" nslookup [-opt ...] - server # interactive mode using 'server'\n");
+" nslookup8 [-opt ...] - server # interactive mode using 'server'\n");
fprintf(stderr,
-" nslookup [-opt ...] host # just look up 'host' using default server\n");
+" nslookup8 [-opt ...] host # just look up 'host' using default server\n");
fprintf(stderr,
-" nslookup [-opt ...] host server # just look up 'host' using 'server'\n");
+" nslookup8 [-opt ...] host server # just look up 'host' using 'server'\n");
exit(1);
}
diff -Naur bind8-8.4.7/src/bin/nslookup/pathnames.h bind8-8.4.7.oden/src/bin/nslookup/pathnames.h
--- bind8-8.4.7/src/bin/nslookup/pathnames.h 2000-11-08 07:47:32.000000000 +0100
+++ bind8-8.4.7.oden/src/bin/nslookup/pathnames.h 2005-12-21 07:45:04.000000000 +0100
@@ -58,16 +58,16 @@
* $Id: pathnames.h,v 8.2 2000/11/08 06:47:32 marka Exp $
*/
-#define _PATH_NSLOOKUPRC "/.nslookuprc"
+#define _PATH_NSLOOKUPRC "/.nslookup8rc"
#ifndef _PATH_PAGERCMD
-#define _PATH_PAGERCMD "more"
+#define _PATH_PAGERCMD "less"
#endif
#ifndef _PATH_HELPFILE
#if defined(BSD) && BSD >= 198810
#define _PATH_HELPFILE "/usr/share/misc/nslookup.help"
#else
-#define _PATH_HELPFILE "/usr/lib/nslookup.help"
+#define _PATH_HELPFILE "/usr/lib/nslookup8.help"
#endif
#endif
