Support the private resolver.

diff --git a/Makefile.conf b/Makefile.conf
index 4f0663891e02381dffc0e4ad3aa9725a2405abf1..d8056018b33163f0e826cbf5dcaf9b8081f34a90 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -41,14 +41,15 @@ LIBS = $(BINDLIB)
 COPTS = $(BINDDEF)
 RANLIB = ranlib
 
-BINDLIBDEF = -L/usr/local/bind/lib -lbind
-BINDINCDEF = -I/usr/local/bind/include
+BINDLIBDEF = ../minires/libres.a
+BINDINCDEF =
 
 ## Dynamic DNS update support
 ##--nsupdate--
 #BINDLIB = $(BINDLIBDEF)
 #BINDINC = $(BINDINCDEF)
 #BINDDEF = -DNSUPDATE 
+#MINIRES = minires
 ##--nsupdate--
 
 # Major version number (if applicable)

diff --git a/Makefile.dist b/Makefile.dist
index b2708947c11c26948cde1a36f2fb66bcfbf84f82..bdeac2ac56830aeb2d2a634f3fdcb92e8bb7762a 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -17,7 +17,7 @@
 # http://www.isc.org for more information.
 #
 
-SUBDIRS=       common omapip server client relay dhcpctl
+SUBDIRS=       common omapip $(MINIRES) server client relay dhcpctl
 
 all:
        @for dir in ${SUBDIRS}; do \

diff --git a/client/Makefile.dist b/client/Makefile.dist
index 43c42e2d6147f622bdb998d4ba2efe98e2873842..7dce08c2bdee30787fed08872f5a5e8923e86ceb 100644 (file)
--- a/client/Makefile.dist
+++ b/client/Makefile.dist
@@ -28,7 +28,7 @@ MAN    = dhclient.8 dhclient.conf.5 dhclient-script.8 dhclient.leases.5
 
 DEBUG  = -g
 INCLUDES = -I.. $(BINDINC) -I../includes
-DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a
+DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a ../minires/libres.a
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 
 all:   $(PROG) $(CATMANPAGES)

diff --git a/common/print.c b/common/print.c
index c0ba9cc8cd4e40425466a18322d1f6d6115c8de4..18c63d80358a7ddb82f98716fa3feaac804593e2 100644 (file)
--- a/common/print.c
+++ b/common/print.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: print.c,v 1.33 2000/01/26 14:55:34 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: print.c,v 1.34 2000/02/02 07:22:33 mellon Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -898,7 +898,7 @@ void print_dns_status (int status, ns_updque *uq)
        const char *predicate = "if", *en, *op;
        int errorp;
 
-       for (u = HEAD (*uq); u; u = NEXT (u, r_link)) {
+       for (u = ISC_LIST_HEAD (*uq); u; u = ISC_LIST_NEXT (u, r_link)) {
                ttlp = 0;
                if (s != &obuf [0] && s + 1 < end)
                        *s++ = ' ';
@@ -1031,7 +1031,7 @@ void print_dns_status (int status, ns_updque *uq)
                                        *s++ = ' ';
                        }
                }
-               if (u == TAIL (*uq))
+               if (u == ISC_LIST_TAIL (*uq))
                        break;
        }
        if (s == &obuf [0]) {

diff --git a/common/tree.c b/common/tree.c
index b1cb73d6b48c1687d0cdd3094e04746ffc996820..8958969492a0cfa47110c9b5b6101b9054d1ec22 100644 (file)
--- a/common/tree.c
+++ b/common/tree.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: tree.c,v 1.71 2000/01/27 22:40:49 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: tree.c,v 1.72 2000/02/02 07:22:33 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1771,7 +1771,7 @@ int evaluate_numeric_expression (result, packet, lease,
                        res_ninit (&res);
                        inited = 1;
                }
-               INIT_LIST (uq);
+               ISC_LIST_INIT (uq);
                cur = expr;
                do {
                    next = cur -> data.dns_transaction.cdr;
@@ -1781,13 +1781,13 @@ int evaluate_numeric_expression (result, packet, lease,
                               scope, cur -> data.dns_transaction.car));
                    if (!status)
                            goto dns_bad;
-                   APPEND (uq, nut, r_link);
+                   ISC_LIST_APPEND (uq, nut, r_link);
                    cur = next;
                } while (next);
 
                /* Do the update and record the error code, if there was
                   an error; otherwise set it to NOERROR. */
-               if (res_nupdate (&res, HEAD (uq), NULL))
+               if (res_nupdate (&res, ISC_LIST_HEAD (uq), NULL))
                        *result = NOERROR;
                else
                        /* The resolver doesn't return any actual error
@@ -1799,9 +1799,9 @@ int evaluate_numeric_expression (result, packet, lease,
                print_dns_status ((int)*result, &uq);
 
              dns_bad:
-               while (!EMPTY (uq)) {
-                       ns_updrec *tmp = HEAD (uq);
-                       UNLINK (uq, tmp, r_link);
+               while (!ISC_LIST_EMPTY (uq)) {
+                       ns_updrec *tmp = ISC_LIST_HEAD (uq);
+                       ISC_LIST_UNLINK (uq, tmp, r_link);
                        if (tmp -> r_data) {
                                dfree (tmp -> r_data, MDL);
                                tmp -> r_data = (char *)0;

diff --git a/configure b/configure
index 23a7b22a825541a56b97ad6766ba11d15fcdb3a5..57ff04565a9e99b727a31523495155777ae6eb30 100755 (executable)
--- a/configure
+++ b/configure
@@ -106,7 +106,7 @@ if [ x$major != x ] && [ x$minor != x ]; then
   minversubst="-e /^##--minver--/,/^##--minver--/s/MinorVersion/$minor/"
 fi
 
-for foo in . client server relay common omapip dhcpctl; do
+for foo in . client server relay common omapip dhcpctl minires; do
         (sed $nsupdate $majversubst $minversubst \
              -e "/^##--${sysname}--/,/^##--${sysname}--/s/^#//" \
                <Makefile.conf; cat site.conf; cat $foo/Makefile.dist)  \

diff --git a/server/Makefile.dist b/server/Makefile.dist
index 19d18f2dc76ea36cf978da016d60406389a45ab8..25c00f954473c8bddbdeea752e44db54fa808027 100644 (file)
--- a/server/Makefile.dist
+++ b/server/Makefile.dist
@@ -28,7 +28,7 @@ MAN    = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 
 DEBUG  = -g
 INCLUDES = -I.. $(BINDINC) -I../includes
-DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a
+DHCPLIB = ../common/libdhcp.a ../omapip/libomapi.a ../minires/libres.a
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 
 all:   $(PROG) $(CATMANPAGES)