From: Shawn Routhier Date: Thu, 29 Oct 2009 00:46:48 +0000 (+0000) Subject: Cleanup for ddns changes ticket rt20527 X-Git-Tag: v4_2_0a1~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ac2a573a54c0aeafd3287b4cc797b362f910114;p=thirdparty%2Fdhcp.git Cleanup for ddns changes ticket rt20527 --- diff --git a/common/dispatch.c b/common/dispatch.c index ba5fa65b5..564364215 100644 --- a/common/dispatch.c +++ b/common/dispatch.c @@ -28,6 +28,8 @@ #include "dhcpd.h" +#include + struct timeout *timeouts; static struct timeout *free_timeouts; diff --git a/dst/base64.c b/dst/base64.c index db70f6815..f4db7124a 100644 --- a/dst/base64.c +++ b/dst/base64.c @@ -47,7 +47,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: base64.c,v 1.4 2009/10/28 04:12:30 sar Exp $"; +static const char rcsid[] = "$Id: base64.c,v 1.5 2009/10/29 00:46:48 sar Exp $"; #endif /* not lint */ #include @@ -64,6 +64,8 @@ static const char rcsid[] = "$Id: base64.c,v 1.4 2009/10/28 04:12:30 sar Exp $"; #include +#include "cdefs.h" +#include "osdep.h" #include "arpa/nameser.h" #define Assert(Cond) if (!(Cond)) abort() diff --git a/dst/dst_api.c b/dst/dst_api.c index c42cf5826..97bef9ed2 100644 --- a/dst/dst_api.c +++ b/dst/dst_api.c @@ -1,5 +1,5 @@ #ifndef LINT -static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/dst_api.c,v 1.8 2009/10/28 04:12:30 sar Exp $"; +static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/dst_api.c,v 1.9 2009/10/29 00:46:48 sar Exp $"; #endif /* @@ -54,6 +54,8 @@ static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/dst_api.c,v 1.8 2009 #include #include +#include "cdefs.h" +#include "osdep.h" #include "arpa/nameser.h" #include "dst_internal.h" diff --git a/dst/dst_support.c b/dst/dst_support.c index 3522e2fa0..fb9771cf7 100644 --- a/dst/dst_support.c +++ b/dst/dst_support.c @@ -1,4 +1,4 @@ -static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/dst_support.c,v 1.5 2009/10/28 04:12:30 sar Exp $"; +static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/dst_support.c,v 1.6 2009/10/29 00:46:48 sar Exp $"; /* @@ -28,6 +28,8 @@ static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/dst_support.c,v 1.5 #include #include +#include "cdefs.h" +#include "osdep.h" #include "arpa/nameser.h" #include "dst_internal.h" diff --git a/dst/hmac_link.c b/dst/hmac_link.c index 8fbf72be6..671d7b7f4 100644 --- a/dst/hmac_link.c +++ b/dst/hmac_link.c @@ -1,6 +1,6 @@ #ifdef HMAC_MD5 #ifndef LINT -static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/hmac_link.c,v 1.4 2009/10/28 04:12:30 sar Exp $"; +static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/hmac_link.c,v 1.5 2009/10/29 00:46:48 sar Exp $"; #endif /* * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc. @@ -34,6 +34,8 @@ static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/hmac_link.c,v 1.4 20 #include #include +#include "cdefs.h" +#include "osdep.h" #include "arpa/nameser.h" #include "dst_internal.h" diff --git a/dst/md5_dgst.c b/dst/md5_dgst.c index f134b8f43..2b94a1c4d 100644 --- a/dst/md5_dgst.c +++ b/dst/md5_dgst.c @@ -83,6 +83,8 @@ #include #include #include "md5_locl.h" +#include "cdefs.h" +#include "osdep.h" #ifdef USE_MD5 /* Added by ogud@tis.com 1998/1/26 */ diff --git a/dst/prandom.c b/dst/prandom.c index a818cc1b4..d00448d17 100644 --- a/dst/prandom.c +++ b/dst/prandom.c @@ -1,5 +1,5 @@ #ifndef LINT -static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/prandom.c,v 1.7 2009/10/28 04:12:30 sar Exp $"; +static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/prandom.c,v 1.8 2009/10/29 00:46:48 sar Exp $"; #endif /* * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc. @@ -35,6 +35,8 @@ static const char rcsid[] = "$Header: /tmp/cvstest/DHCP/dst/prandom.c,v 1.7 2009 #include #define NEED_PRAND_CONF +#include "cdefs.h" +#include "osdep.h" #include "dst_internal.h" #include "arpa/nameser.h" diff --git a/includes/Makefile.am b/includes/Makefile.am index b77389450..4a462d5ba 100644 --- a/includes/Makefile.am +++ b/includes/Makefile.am @@ -1,9 +1,11 @@ nobase_include_HEADERS = omapip/alloc.h omapip/buffer.h omapip/convert.h \ - omapip/hash.h omapip/omapip.h omapip/omapip_p.h \ - omapip/trace.h + omapip/hash.h omapip/isclib.h omapip/omapip.h \ + omapip/omapip_p.h omapip/result.h omapip/trace.h \ + isc-dhcp/dst.h EXTRA_DIST = cdefs.h ctrace.h dhcp.h dhcp6.h dhcpd.h dhctoken.h failover.h \ - heap.h inet.h osdep.h site.h statement.h tree.h t_api.h \ + heap.h inet.h minires.h osdep.h site.h statement.h tree.h \ + t_api.h \ arpa/nameser.h arpa/nameser_compat.h \ netinet/if_ether.h netinet/ip.h netinet/ip_icmp.h netinet/udp.h diff --git a/omapip/isclib.c b/omapip/isclib.c index f4cb46a65..3225096d2 100644 --- a/omapip/isclib.c +++ b/omapip/isclib.c @@ -27,6 +27,8 @@ #include "dhcpd.h" +#include + dhcp_context_t dhcp_gbl_ctx; void diff --git a/util/bind.sh b/util/bind.sh index 883262077..59cfdf09a 100644 --- a/util/bind.sh +++ b/util/bind.sh @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: bind.sh,v 1.2 2009/10/28 04:12:30 sar Exp $ +# $Id: bind.sh,v 1.3 2009/10/29 00:46:48 sar Exp $ # Get the bind distribution for the libraries # This script is used to build the DHCP distribution and shouldn't be shipped @@ -30,7 +30,7 @@ binddir=$topdir/bind case $# in 1) case "$1" in - 4.2.0) BINDTAG=v9_7_0b1 ;; + 4.2.0a1) BINDTAG=v9_7_0b1 ;; 4.1.2) BINDTAG=v9_7_0b1 ;; *) echo "usage: sh bind.sh " >&2 exit 1 diff --git a/util/bindlib.sh b/util/bindlib.sh index f755deec1..0194b5b4c 100644 --- a/util/bindlib.sh +++ b/util/bindlib.sh @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: bindlib.sh,v 1.2 2009/10/28 04:12:30 sar Exp $ +# $Id: bindlib.sh,v 1.3 2009/10/29 00:46:48 sar Exp $ # Configure, build and install the bind export libraries for use by DHCP # @@ -34,7 +34,7 @@ bindsrcdir="$2" # Configure the export libraries cd $bindsrcdir -./configure --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=$binddir/include --with-export-libdir=$binddir/lib > $binddir/configure.log +./configure --without-openssl --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=$binddir/include --with-export-libdir=$binddir/lib > $binddir/configure.log # Build the export librares cd lib/export