pullup:

1031.   [bug]           libbind.a: isc__gettimeofday() infinite recursion.
                        [RT #1858]

diff --git a/CHANGES b/CHANGES
index 9fc84b6ba0b938158a4ec326dd26e5069ef4df60..e1ad7e41c4b9dd8404e8c2a5e567f2956c111c57 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
        --- 9.2.0rc6 released ---
 
+1031.  [bug]           libbind.a: isc__gettimeofday() infinite recursion.
+                       [RT #1858]
+
 1030.  [bug]           On systems with no resolv.conf file, nsupdate
                        exited with an error rather than defaulting
                        to using the loopback address. [RT #1836]

diff --git a/lib/bind/bsd/gettimeofday.c b/lib/bind/bsd/gettimeofday.c
index c6415aa93486d1497fd4000136900e51bcbb99af..7d3a8e7b4badc99d7f27768ce2496a8d51c93c83 100644 (file)
--- a/lib/bind/bsd/gettimeofday.c
+++ b/lib/bind/bsd/gettimeofday.c
@@ -1,9 +1,8 @@
 #ifndef LINT
-static const char rcsid[] = "$Id: gettimeofday.c,v 1.1 2001/03/29 06:30:32 marka Exp $";
+static const char rcsid[] = "$Id: gettimeofday.c,v 1.1.2.1 2001/10/08 18:10:57 gson Exp $";
 #endif
 
 #include "port_before.h"
-#undef gettimeofday
 #include <stdio.h>
 #include <syslog.h>
 #include <sys/time.h>
@@ -21,6 +20,7 @@ int
 isc__gettimeofday(struct timeval *tp, struct timezone *tzp) {
        int res;
 
+#undef gettimeofday
        res = gettimeofday(tp, tzp);
        if (res < 0)
                return (res);