dns_rootns_create() is now in libdns

bin/named/Makefile.in

@@ -39,13 +39,13 @@ TARGETS =	named
 
 OBJS =		client.@O@ interfacemgr.@O@ listenlist.@O@ \
 		log.@O@ main.@O@ notify.@O@ \
-		query.@O@ rootns.@O@ server.@O@ update.@O@ xfrout.@O@
+		query.@O@ server.@O@ update.@O@ xfrout.@O@
 
 UOBJS =		unix/os.@O@
 
 SRCS =		client.c interfacemgr.c listenlist.c \
 		log.c main.c notify.c \
-		query.c rootns.c server.c update.c xfrout.c
+		query.c server.c update.c xfrout.c
 
 @BIND9_MAKE_RULES@
 

bin/named/main.c

+#include <dns/rootns.h>
+
 /*
  * Copyright (C) 1999  Internet Software Consortium.
  * 

bin/named/server.c

@@ -46,6 +46,7 @@
 #include <dns/name.h>
 #include <dns/rdata.h>
 #include <dns/result.h>
+#include <dns/rootns.h>
 #include <dns/tkey.h>
 #include <dns/tsig.h>
 #include <dns/types.h>
@@ -58,7 +59,6 @@
 #include <named/interfacemgr.h>
 #include <named/listenlist.h>
 #include <named/log.h>
-#include <named/rootns.h>
 #include <named/server.h>
 #include <named/types.h>
 
@@ -715,7 +715,7 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) {
 	RUNTIME_CHECK(result == ISC_R_SUCCESS); 	
 	server->roothints = NULL;
 		
-	CHECKFATAL(ns_rootns_create(mctx, &server->roothints),
+	CHECKFATAL(dns_rootns_create(mctx, &server->roothints),
 		   "setting up root hints");
 	
 	/*

lib/dns/Makefile.in

@@ -122,7 +122,7 @@ OBJS =		a6.@O@ acl.@O@ aclconf.@O@ adb.@O@ byaddr.@O@ \
 		name.@O@ ncache.@O@ nxt.@O@ \
 		rbt.@O@ rbtdb.@O@ rbtdb64.@O@ rdata.@O@ rdatalist.@O@ \
 		rdataset.@O@ rdatasetiter.@O@ rdataslab.@O@ resolver.@O@ \
-		result.@O@ \
+		result.@O@ rootns.@O@ \
 		tcpmsg.@O@ time.@O@ tkey.@O@ tsig.@O@ ttl.@O@ \
 		version.@O@ view.@O@ xfrin.@O@ zone.@O@ zoneconf.@O@ zt.@O@ \
 		${DSTOBJS} ${OPENSSLOBJS} ${DNSSAFEOBJS} ${CONFOBJS}
@@ -136,7 +136,7 @@ SRCS =		a6.c acl.c aclconf.c adb.c byaddr.c \
 		name.c ncache.c nxt.c \
 		rbt.c rbtdb.c rbtdb64.c rdata.c rdatalist.c \
 		rdataset.c rdatasetiter.c rdataslab.c resolver.c \
-		result.c \
+		result.c rootns.c \
 		tcpmsg.c time.c tkey.c tsig.c ttl.c \
 		version.c view.c xfrin.c zone.c zoneconf.c zt.c
 

bin/named/include/named/rootns.h → lib/dns/include/dns/rootns.h

 /*
- * Copyright (C) 1999  Internet Software Consortium.
+ * Copyright (C) 1999,2000  Internet Software Consortium.
  * 
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,9 +18,8 @@
 #ifndef NS_ROOTNS_H
 #define NS_ROOTNS_H 1
 
-#include <isc/types.h>
-#include <dns/db.h>
+#include <dns/types.h>
 
-isc_result_t ns_rootns_create(isc_mem_t *mctx, dns_db_t **target);
+isc_result_t dns_rootns_create(isc_mem_t *mctx, dns_db_t **target);
 
 #endif /* NS_ROOTNS_H */

bin/named/rootns.c → lib/dns/rootns.c

 /*
- * Copyright (C) 1999  Internet Software Consortium.
+ * Copyright (C) 1999,2000  Internet Software Consortium.
  * 
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -26,8 +26,7 @@
 #include <dns/types.h>
 #include <dns/db.h>
 #include <dns/master.h>
-
-#include <named/rootns.h>
+#include <dns/rootns.h>
 
 static char root_ns[] =
 ";\n"
@@ -64,7 +63,7 @@ static char root_ns[] =
 "G.ROOT-SERVERS.NET.     3600000 IN      A       192.112.36.4\n";
 
 isc_result_t
-ns_rootns_create(isc_mem_t *mctx, dns_db_t **target) {
+dns_rootns_create(isc_mem_t *mctx, dns_db_t **target) {
 	isc_result_t result, eresult;
 	isc_buffer_t source;
 	size_t len;

util/copyrights

@@ -17,7 +17,6 @@
 ./bin/named/include/named/main.h		C	1999,2000
 ./bin/named/include/named/notify.h		C	1999,2000
 ./bin/named/include/named/query.h		C	1999,2000
-./bin/named/include/named/rootns.h		C	1999,2000
 ./bin/named/include/named/server.h		C	1999,2000
 ./bin/named/include/named/types.h		C	1999,2000
 ./bin/named/include/named/update.h		C	1999,2000
@@ -29,7 +28,6 @@
 ./bin/named/named.conf.test			X	1999,2000
 ./bin/named/notify.c				C	1999,2000
 ./bin/named/query.c				C	1999,2000
-./bin/named/rootns.c				C	1999,2000
 ./bin/named/server.c				C	1999,2000
 ./bin/named/unix/.cvsignore			X	1999,2000
 ./bin/named/unix/Makefile.in			MAKE	1999,2000
@@ -386,6 +384,7 @@
 ./lib/dns/include/dns/rdatatype.h		C	1998,1999,2000
 ./lib/dns/include/dns/resolver.h		C	1999,2000
 ./lib/dns/include/dns/result.h			C	1998,1999,2000
+./lib/dns/include/dns/rootns.h			C	1999,2000
 ./lib/dns/include/dns/secalg.h			C	1999,2000
 ./lib/dns/include/dns/secproto.h		C	1999,2000
 ./lib/dns/include/dns/tcpmsg.h			C	1999,2000
@@ -506,6 +505,7 @@
 ./lib/dns/rdataslab.c				C	1999,2000
 ./lib/dns/resolver.c				C	1999,2000
 ./lib/dns/result.c				C	1998,1999,2000
+./lib/dns/rootns.c				C	1999,2000
 ./lib/dns/sec/.cvsignore			X	1999,2000
 ./lib/dns/sec/Makefile.in			MAKE	1998,1999,2000
 ./lib/dns/sec/dnssafe/.cvsignore		X	1999,2000