protect the simple database stuff with NOMINUM_PUBLIC

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index f10ba05ae73fad1bae76832a4154fbfc7ef0df41..6723e56a836ab5ebca3d2b9b2ae355219bd312b1 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.102 2000/09/20 19:05:58 gson Exp $
+# $Id: Makefile.in,v 1.103 2000/09/26 22:45:50 bwelling Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -85,6 +85,8 @@ OPENSSLOBJS = sec/openssl/a_bitstr.@O@ sec/openssl/a_bytes.@O@ \
                sec/openssl/stack.@O@ sec/openssl/th-lock.@O@ \
                sec/openssl/x_sig.@O@ sec/openssl/x_algor.@O@
 
+OTHEROBJS =    sdb.@O@
+
 # Alphabetically
 OBJS =         a6.@O@ acl.@O@ aclconf.@O@ adb.@O@ byaddr.@O@ \
                cache.@O@ callbacks.@O@ compress.@O@ \
@@ -94,11 +96,13 @@ OBJS =              a6.@O@ acl.@O@ aclconf.@O@ adb.@O@ byaddr.@O@ \
                name.@O@ ncache.@O@ nxt.@O@ peer.@O@ \
                rbt.@O@ rbtdb.@O@ rbtdb64.@O@ rdata.@O@ rdatalist.@O@ \
                rdataset.@O@ rdatasetiter.@O@ rdataslab.@O@ request.@O@ \
-               resolver.@O@ result.@O@ rootns.@O@ sdb.@O@ ssu.@O@ \
+               resolver.@O@ result.@O@ rootns.@O@ ssu.@O@ \
                tcpmsg.@O@ time.@O@ tkey.@O@ tkeyconf.@O@ \
                tsig.@O@ tsigconf.@O@ ttl.@O@ validator.@O@ \
                version.@O@ view.@O@ xfrin.@O@ zone.@O@ zoneconf.@O@ zt.@O@ \
-               ${DSTOBJS} @DST_OPENSSL_OBJS@ ${CONFOBJS}
+               ${OTHEROBJS} ${DSTOBJS} @DST_OPENSSL_OBJS@ ${CONFOBJS}
+
+OTHERSRCS =    sdb.c
 
 # Alphabetically
 SRCS =         a6.c acl.c aclconf.c adb.c byaddr.c \
@@ -109,10 +113,11 @@ SRCS =            a6.c acl.c aclconf.c adb.c byaddr.c \
                name.c ncache.c nxt.c peer.c \
                rbt.c rbtdb.c rbtdb64.c rdata.c rdatalist.c \
                rdataset.c rdatasetiter.c rdataslab.c request.c \
-               resolver.c result.c rootns.c sdb.c ssu.c \
+               resolver.c result.c rootns.c ssu.c \
                tcpmsg.c time.c tkey.c tkeyconf.c \
                tsig.c tsigconf.c ttl.c validator.c \
-               version.c view.c xfrin.c zone.c zoneconf.c zt.c
+               version.c view.c xfrin.c zone.c zoneconf.c zt.c \
+               ${OTHERSRCS}
 
 SUBDIRS =      include sec config
 TARGETS =      include/dns/enumtype.h include/dns/enumclass.h \

diff --git a/lib/dns/db.c b/lib/dns/db.c
index 81719ccb16420e3ba9cfa777cb18c3c7ffb63dee..79d7269e650df210340654bf955cb3f62cc75089 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.c,v 1.55 2000/08/31 12:15:09 marka Exp $ */
+/* $Id: db.c,v 1.56 2000/09/26 22:45:52 bwelling Exp $ */
 
 /***
  *** Imports
@@ -58,12 +58,16 @@ typedef struct {
 
 #include "rbtdb.h"
 #include "rbtdb64.h"
+#ifndef NOMINUM_PUBLIC
 #include "sdb_p.h"
+#endif /* NOMINUM_PUBLIC */
 
 static impinfo_t implementations[] = {
        { "rbt", dns_rbtdb_create },
        { "rbt64", dns_rbtdb64_create },
+#ifndef NOMINUM_PUBLIC
        { "simple", dns_sdb_create },
+#endif /* NOMINUM_PUBLIC */
        { NULL, NULL }
 };
 

diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index b4601239ec990cc6e79e18071df9e87127d86b99..02eea68eee0a8d5aea8370c30bfc28160731ebc6 100644 (file)
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.33 2000/09/20 19:05:59 gson Exp $
+# $Id: Makefile.in,v 1.34 2000/09/26 22:45:57 bwelling Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -21,6 +21,8 @@ top_srcdir =  @top_srcdir@
 
 @BIND9_VERSION@
 
+OTHERHEADERS = sdb.h
+
 HEADERS =      a6.h acl.h aclconf.h adb.h byaddr.h cache.h callbacks.h \
                cert.h compress.h \
                confacl.h confcache.h confcommon.h confctl.h confctx.h \
@@ -33,10 +35,10 @@ HEADERS =   a6.h acl.h aclconf.h adb.h byaddr.h cache.h callbacks.h \
                nxt.h peer.h rbt.h rcode.h \
                rdata.h rdataclass.h rdatalist.h rdataset.h rdatasetiter.h \
                rdataslab.h rdatatype.h request.h resolver.h result.h \
-               rootns.h sdb.h secalg.h secproto.h ssu.h \
+               rootns.h secalg.h secproto.h ssu.h \
                tcpmsg.h time.h tkey.h \
                tkeyconf.h tsig.h ttl.h types.h validator.h view.h xfrin.h \
-               zone.h zoneconf.h zt.h
+               zone.h zoneconf.h zt.h ${OTHERHEADERS}
 
 GENHEADERS =   enumclass.h enumtype.h rdatastruct.h
 

diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h
index 3b06922ac4defae05d394ca1ffd75deda25edd24..bd0dc9e92fe8860d42bb6866bef8dfa9f733e690 100644 (file)
--- a/lib/dns/include/dns/sdb.h
+++ b/lib/dns/include/dns/sdb.h
@@ -15,11 +15,13 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb.h,v 1.6 2000/08/23 18:28:03 bwelling Exp $ */
+/* $Id: sdb.h,v 1.7 2000/09/26 22:45:59 bwelling Exp $ */
 
 #ifndef DNS_SDB_H
 #define DNS_SDB_H 1
 
+/* NOMINUM_PUBLIC_DELETE */
+
 /*****
  ***** Module Info
  *****/

diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 5ec991f0484d0deb660487b4d2c64b345d7504fa..562da3836b165ab271e2cf317e23cf04ecd15645 100644 (file)
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -15,7 +15,9 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb.c,v 1.9 2000/08/31 13:04:47 marka Exp $ */
+/* $Id: sdb.c,v 1.10 2000/09/26 22:45:53 bwelling Exp $ */
+
+/* NOMINUM_PUBLIC_DELETE */
 
 #include <config.h>
 

diff --git a/lib/dns/sdb_p.h b/lib/dns/sdb_p.h
index 9cbcb630271305d3f7b45cacba50f69237cf7920..df2fe255e03cc370b876032a956423c48faf5073 100644 (file)
--- a/lib/dns/sdb_p.h
+++ b/lib/dns/sdb_p.h
@@ -15,7 +15,9 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sdb_p.h,v 1.3 2000/08/22 01:37:50 gson Exp $ */
+/* $Id: sdb_p.h,v 1.4 2000/09/26 22:45:54 bwelling Exp $ */
+
+/* NOMINUM_PUBLIC_DELETE */
 
 #ifndef DNS_SDB_P_H
 #define DNS_SDB_P_H 1