rename zonec to nsd-zonec

6 files changed, 38 insertions, 40 deletions

diff --git a/usr.sbin/nsd/Makefile.bsd-wrapper b/usr.sbin/nsd/Makefile.bsd-wrapper
index 37fab8b6761..e14b94089a5 100644
--- a/usr.sbin/nsd/Makefile.bsd-wrapper
+++ b/usr.sbin/nsd/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.1 2010/01/15 19:28:00 jakob Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.2 2010/01/15 19:39:36 jakob Exp $
 
 .include <bsd.own.mk>
 
@@ -22,12 +22,10 @@ CONFIGURE_OPTS=	--prefix=/usr \
 		--enable-root-server \
 		--enable-nsid
 
-PROG=	nsd zonec \
-	nsd-notify nsd-checkconf nsd-patch nsd-xfer
+PROG=	nsd nsd-zonec nsd-notify nsd-checkconf nsd-patch nsd-xfer
 
-MAN=	nsd.8 nsdc.8 zonec.8 \
-	nsd-notify.8 nsd-checkconf.8 nsd-patch.8 nsd-xfer.8 \
-	nsd.conf.5
+MAN=	nsd.8 nsdc.8 nsd-zonec.8 nsd-notify.8 nsd-checkconf.8 nsd-patch.8 \
+	nsd-xfer.8 nsd.conf.5
 
 
 all:	config.status
diff --git a/usr.sbin/nsd/Makefile.in b/usr.sbin/nsd/Makefile.in
index 5f1d2ac5515..c7c01ef81fd 100644
--- a/usr.sbin/nsd/Makefile.in
+++ b/usr.sbin/nsd/Makefile.in
@@ -60,7 +60,7 @@ EDIT		= sed \
 			-e 's,@spriority\@,$(spriority),g' \
 			-e 's,@kpriority\@,$(kpriority),g' 
 
-TARGETS 	= nsd zonec nsd-notify nsd-xfer nsdc.sh nsd-checkconf nsd-patch nsd.conf.sample
+TARGETS 	= nsd nsd-zonec nsd-notify nsd-xfer nsdc.sh nsd-checkconf nsd-patch nsd.conf.sample
 
 ALL_OBJECTS	=			\
 	answer.o			\
@@ -134,7 +134,7 @@ NSD_OBJECTS	=				\
 	xfrd-tcp.o				\
 	xfrd.o
 
-ZONEC_OBJECTS	=				\
+NSD_ZONEC_OBJECTS	=			\
 	answer.o				\
 	axfr.o					\
 	buffer.o				\
@@ -324,7 +324,7 @@ install: all
 	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
 	$(INSTALL) -d $(DESTDIR)$(mandir)/man5
 	$(INSTALL) nsd $(DESTDIR)$(sbindir)/nsd
-	$(INSTALL) zonec $(DESTDIR)$(sbindir)/zonec
+	$(INSTALL) nsd-zonec $(DESTDIR)$(sbindir)/nsd-zonec
 	$(INSTALL) nsdc.sh $(DESTDIR)$(sbindir)/nsdc
 	$(INSTALL) nsd-notify $(DESTDIR)$(sbindir)/nsd-notify
 	$(INSTALL) nsd-checkconf $(DESTDIR)$(sbindir)/nsd-checkconf
@@ -332,7 +332,7 @@ install: all
 	$(INSTALL) nsd-xfer $(DESTDIR)$(sbindir)/nsd-xfer
 	$(INSTALL_DATA) $(srcdir)/nsd.8 $(DESTDIR)$(mandir)/man8
 	$(INSTALL_DATA) $(srcdir)/nsdc.8 $(DESTDIR)$(mandir)/man8
-	$(INSTALL_DATA) $(srcdir)/zonec.8 $(DESTDIR)$(mandir)/man8
+	$(INSTALL_DATA) $(srcdir)/nsd-zonec.8 $(DESTDIR)$(mandir)/man8/nsd-zonec.8
 	$(INSTALL_DATA) $(srcdir)/nsd-notify.8 $(DESTDIR)$(mandir)/man8/nsd-notify.8
 	$(INSTALL_DATA) $(srcdir)/nsd-checkconf.8 $(DESTDIR)$(mandir)/man8/nsd-checkconf.8
 	$(INSTALL_DATA) $(srcdir)/nsd-patch.8 $(DESTDIR)$(mandir)/man8/nsd-patch.8
@@ -342,8 +342,8 @@ install: all
 
 uninstall:
 	@echo
-	rm -f -- $(DESTDIR)$(sbindir)/nsd $(DESTDIR)$(sbindir)/zonec $(DESTDIR)$(sbindir)/nsdc $(DESTDIR)$(sbindir)/nsd-notify $(DESTDIR)$(sbindir)/nsd-xfer $(DESTDIR)$(sbindir)/nsd-checkconf $(DESTDIR)$(sbindir)/nsd-patch
-	rm -f -- $(DESTDIR)$(mandir)/man8/nsd.8 $(DESTDIR)$(mandir)/man8/nsdc.8 $(DESTDIR)$(mandir)/man8/zonec.8 $(DESTDIR)$(mandir)/man8/nsd-notify.8 $(DESTDIR)$(mandir)/man8/nsd-xfer.8 $(DESTDIR)$(mandir)/man5/nsd.conf.5
+	rm -f -- $(DESTDIR)$(sbindir)/nsd $(DESTDIR)$(sbindir)/nsd-zonec $(DESTDIR)$(sbindir)/nsdc $(DESTDIR)$(sbindir)/nsd-notify $(DESTDIR)$(sbindir)/nsd-xfer $(DESTDIR)$(sbindir)/nsd-checkconf $(DESTDIR)$(sbindir)/nsd-patch
+	rm -f -- $(DESTDIR)$(mandir)/man8/nsd.8 $(DESTDIR)$(mandir)/man8/nsdc.8 $(DESTDIR)$(mandir)/man8/nsd-zonec.8 $(DESTDIR)$(mandir)/man8/nsd-notify.8 $(DESTDIR)$(mandir)/man8/nsd-xfer.8 $(DESTDIR)$(mandir)/man5/nsd.conf.5
 	rm -f -- $(DESTDIR)$(mandir)/man8/nsd-checkconf.8 $(DESTDIR)$(mandir)/man8/nsd-patch.8
 	rm -f -- $(DESTDIR)$(pidfile) $(DESTDIR)$(dbfile)
 	@echo
@@ -354,8 +354,8 @@ test:
 nsd:	$(NSD_OBJECTS) $(LIBOBJS)
 	$(LINK) -o $@ $(NSD_OBJECTS) $(LIBOBJS) $(LIBS)
 
-zonec:	$(ZONEC_OBJECTS) $(LIBOBJS)
-	$(LINK) -o $@ $(ZONEC_OBJECTS) $(LIBOBJS) $(LIBS)
+nsd-zonec:	$(NSD_ZONEC_OBJECTS) $(LIBOBJS)
+	$(LINK) -o $@ $(NSD_ZONEC_OBJECTS) $(LIBOBJS) $(LIBS)
 
 nsd-notify:	$(NSD_NOTIFY_OBJECTS) $(LIBOBJS)
 	$(LINK) -o $@ $(NSD_NOTIFY_OBJECTS) $(LIBOBJS) $(LIBS)
diff --git a/usr.sbin/nsd/zonec.8 b/usr.sbin/nsd/nsd-zonec.8
index b869deebced..03ef67f1016 100644
--- a/usr.sbin/nsd/zonec.8
+++ b/usr.sbin/nsd/nsd-zonec.8
@@ -1,13 +1,13 @@
-.TH "zonec" "8" "Jan  6, 2010" "NLnet Labs" "nsd 3.2.4"
+.TH "nsd-zonec" "8" "Jan  6, 2010" "NLnet Labs" "nsd 3.2.4"
 .\" Copyright (c) 2001\-2008, NLnet Labs. All rights reserved.
 .\" See LICENSE for the license.
 .SH "NAME"
 .LP
-.B zonec
+.B nsd-zonec
 \- NSD zone compiler version 3.2.4.
 .SH "SYNOPSIS"
 .LP
-.B zonec
+.B nsd-zonec
 .RB [ \-v ]
 .RB [ \-h ]
 .RB [ \-C ]
@@ -70,7 +70,7 @@ constructs like:
 .RS
 .B # cat zones* 
 | 
-.B ./zonec \-C \-f nsd.db \-o example.net \-z \-
+.B ./nsd-zonec \-C \-f nsd.db \-o example.net \-z \-
 .RE
 .LP
 .RS
@@ -79,7 +79,7 @@ ignored.
 .RE
 .TP
 .B \-v
-Increase the verbosity of zonec. This flag can be specified multiple 
+Increase the verbosity of nsd-zonec. This flag can be specified multiple 
 times to increase the level of verbosity. The first level of
 verbosity will print per zone summary information. The second level 
 of will print progress information for each 10,000 RRs processed.
diff --git a/usr.sbin/nsd/nsdc.8 b/usr.sbin/nsd/nsdc.8
index 37162dbcc15..1a7b4d80d16 100644
--- a/usr.sbin/nsd/nsdc.8
+++ b/usr.sbin/nsd/nsdc.8
@@ -30,7 +30,7 @@
 .SH "DESCRIPTION"
 .LP
 .B Nsdc
-is the shell script that used to control nsd(8) and zonec(8) from 
+is the shell script that used to control nsd(8) and nsd-zonec(8) from 
 .B NSD
 distribution.
 .B Nsdc
@@ -67,7 +67,7 @@ Initiate nsd(8) name space database reload by sending
 .IR SIGHUP.
 .TP 
 .I rebuild
-Rebuild the nsd(8) database by invoking zonec(8) with appropriate 
+Rebuild the nsd(8) database by invoking nsd-zonec(8) with appropriate 
 arguments.
 .TP 
 .I restart
@@ -150,7 +150,7 @@ otherwise.
 .SH "SEE ALSO"
 .LP
 nsd(8), nsd.conf(5), nsd\-checkconf(8), nsd\-notify(8), 
-nsd\-patch(8), nsd\-xfer(8), zonec(8)
+nsd\-patch(8), nsd\-xfer(8), nsd-zonec(8)
 .SH "AUTHORS"
 .LP
 .B NSD
diff --git a/usr.sbin/nsd/nsdc.sh.in b/usr.sbin/nsd/nsdc.sh.in
index d5287871aea..116852b5e3a 100644
--- a/usr.sbin/nsd/nsdc.sh.in
+++ b/usr.sbin/nsd/nsdc.sh.in
@@ -17,7 +17,7 @@ configfile="@nsdconfigfile@"
 # The directory where NSD binaries reside
 sbindir="@sbindir@"
 
-# how verbose is zonec run. Specify Nothing (empty string), -v or -vv.
+# how verbose is nsd-zonec run. Specify Nothing (empty string), -v or -vv.
 ZONEC_VERBOSE=-v
 
 # how patch is done. Specify 1 (with use of textfiles, default) or 0 (without) 
@@ -337,7 +337,7 @@ do_patch() {
 
 do_rebuild() {
 	lock && \
-	  ${sbindir}/zonec ${ZONEC_VERBOSE} -c ${configfile} -f ${dbfile}.$$ && \
+	  ${sbindir}/nsd-zonec ${ZONEC_VERBOSE} -c ${configfile} -f ${dbfile}.$$ && \
 	  mv ${dbfile}.$$ ${dbfile}
 	result=$?
 	unlock
diff --git a/usr.sbin/nsd/zonec.c b/usr.sbin/nsd/zonec.c
index 705752b4ac7..4ef618cb601 100644
--- a/usr.sbin/nsd/zonec.c
+++ b/usr.sbin/nsd/zonec.c
@@ -1368,9 +1368,9 @@ static void
 usage (void)
 {
 #ifndef NDEBUG
-	fprintf(stderr, "usage: zonec [-v|-h|-C|-F|-L] [-c configfile] [-o origin] [-d directory] [-f database] [-z zonefile]\n\n");
+	fprintf(stderr, "usage: nsd-zonec [-v|-h|-C|-F|-L] [-c configfile] [-o origin] [-d directory] [-f database] [-z zonefile]\n\n");
 #else
-	fprintf(stderr, "usage: zonec [-v|-h|-C] [-c configfile] [-o origin] [-d directory] [-f database] [-z zonefile]\n\n");
+	fprintf(stderr, "usage: nsd-zonec [-v|-h|-C] [-c configfile] [-o origin] [-d directory] [-f database] [-z zonefile]\n\n");
 #endif
 	fprintf(stderr, "\tNSD zone compiler, creates database from zone files.\n");
 	fprintf(stderr, "\tVersion %s. Report bugs to <%s>.\n\n",
@@ -1405,7 +1405,7 @@ main (int argc, char **argv)
 	const char* singlefile = NULL;
 	nsd_options_t* nsd_options = NULL;
 
-	log_init("zonec");
+	log_init("nsd-zonec");
 
 	global_region = region_create(xalloc, free);
 	rr_region = region_create(xalloc, free);
@@ -1466,14 +1466,14 @@ main (int argc, char **argv)
 		nsd_options = nsd_options_create(global_region);
 		if(!parse_options_file(nsd_options, configfile))
 		{
-			fprintf(stderr, "zonec: could not read config: %s\n", configfile);
+			fprintf(stderr, "nsd-zonec: could not read config: %s\n", configfile);
 			exit(1);
 		}
 	}
 	if(nsd_options && zonesdir == 0) zonesdir = nsd_options->zonesdir;
 	if(zonesdir && zonesdir[0]) {
 		if (chdir(zonesdir)) {
-			fprintf(stderr, "zonec: cannot chdir to %s: %s\n", zonesdir, strerror(errno));
+			fprintf(stderr, "nsd-zonec: cannot chdir to %s: %s\n", zonesdir, strerror(errno));
 			exit(1);
 		}
 	}
@@ -1484,14 +1484,14 @@ main (int argc, char **argv)
 
 	/* Create the database */
 	if ((db = namedb_new(dbfile)) == NULL) {
-		fprintf(stderr, "zonec: error creating the database (%s): %s\n",
+		fprintf(stderr, "nsd-zonec: error creating the database (%s): %s\n",
 			dbfile, strerror(errno));
 		exit(1);
 	}
 
 	parser = zparser_create(global_region, rr_region, db);
 	if (!parser) {
-		fprintf(stderr, "zonec: error creating the parser\n");
+		fprintf(stderr, "nsd-zonec: error creating the parser\n");
 		exit(1);
 	}
 
@@ -1504,34 +1504,34 @@ main (int argc, char **argv)
 		 * Read a single zone file with the specified origin
 		 */
 		if(!singlefile) {
-			fprintf(stderr, "zonec: must have -z zonefile when reading single zone.\n");
+			fprintf(stderr, "nsd-zonec: must have -z zonefile when reading single zone.\n");
 			exit(1);
 		}
 		if(!origin) {
-			fprintf(stderr, "zonec: must have -o origin when reading single zone.\n");
+			fprintf(stderr, "nsd-zonec: must have -o origin when reading single zone.\n");
 			exit(1);
 		}
 		if (vflag > 0)
-			fprintf(stdout, "zonec: reading zone \"%s\".\n", origin);
+			fprintf(stdout, "nsd-zonec: reading zone \"%s\".\n", origin);
 		zone_read(origin, singlefile, nsd_options);
 		if (vflag > 0)
-			fprintf(stdout, "zonec: processed %ld RRs in \"%s\".\n", totalrrs, origin);
+			fprintf(stdout, "nsd-zonec: processed %ld RRs in \"%s\".\n", totalrrs, origin);
 	} else {
 		zone_options_t* zone;
 		if(!nsd_options) {
-			fprintf(stderr, "zonec: no zones specified.\n");
+			fprintf(stderr, "nsd-zonec: no zones specified.\n");
 			exit(1);
 		}
 		/* read all zones */
 		RBTREE_FOR(zone, zone_options_t*, nsd_options->zone_options)
 		{
 			if (vflag > 0)
-				fprintf(stdout, "zonec: reading zone \"%s\".\n",
+				fprintf(stdout, "nsd-zonec: reading zone \"%s\".\n",
 					zone->name);
 			zone_read(zone->name, zone->zonefile, nsd_options);
 			if (vflag > 0)
 				fprintf(stdout,
-					"zonec: processed %ld RRs in \"%s\".\n",
+					"nsd-zonec: processed %ld RRs in \"%s\".\n",
 					totalrrs, zone->name);
 			totalrrs = 0;
 		}
@@ -1551,14 +1551,14 @@ main (int argc, char **argv)
 
 	/* Close the database */
 	if (namedb_save(db) != 0) {
-		fprintf(stderr, "zonec: error writing the database (%s): %s\n", db->filename, strerror(errno));
+		fprintf(stderr, "nsd-zonec: error writing the database (%s): %s\n", db->filename, strerror(errno));
 		namedb_discard(db);
 		exit(1);
 	}
 
 	/* Print the total number of errors */
 	if (vflag > 0 || totalerrors > 0) {
-		fprintf(stderr, "\nzonec: done with %ld errors.\n",
+		fprintf(stderr, "\nnsd-zonec: done with %ld errors.\n",
 			totalerrors);
 	}