+ * Fix bogus multiple updates to p in transmit.c (!)

@@ -4,9 +4,12 @@
+  * Fix bogus multiple updates to p in transmit.c (!)
+  * Fix up spurious #undef's in hredirect.h.
     (and there doesn't seem to be much explanation why).
+  * #include <stdlib.h> in internal.h (for abort etc).

diff --git a/changelog b/changelog
index e14fec347af0280fe305ff6e1f7542b6e837817c..93665f332eb9b080ed1dd62dfd4261c436529679 100644 (file)
--- a/changelog
+++ b/changelog
@@ -4,9 +4,12 @@ adns (1.1); urgency=medium
   * Do not spin if connect() fails immediately (!)
   * Stop searching on a CNAME (even if it's broken).
   * When search list runs out, _qf_owner sets owner to query domain.
+  * Fix bogus multiple updates to p in transmit.c (!)
+  * Fix up spurious #undef's in hredirect.h.
   * Don't use <sys/select.h> any more, it was a mistake made in pre-1.0
     (and there doesn't seem to be much explanation why).
   * Understand and sort of check OpenBSD `lookup' resolv.conf directive.
+  * #include <stdlib.h> in internal.h (for abort etc).
   * Always #include <sys/types.h> before <sys/socket.h> (for FreeBSD 4.6).
   * Added wishlist entry re configurable port no.
   * Problem with SERVFAIL in TODO.

diff --git a/regress/hredirect.h b/regress/hredirect.h
index d49da69c301f28047b0e396194bbc56bc48b7b93..75506877c65ee222c7dbb810ada17556d2e400e9 100644 (file)
--- a/regress/hredirect.h
+++ b/regress/hredirect.h
@@ -23,16 +23,16 @@
 #define read Hread
 #undef write
 #define write Hwrite
-#undef int
+#undef writev
 #define writev Hwritev
-#undef int
+#undef gettimeofday
 #define gettimeofday Hgettimeofday
-#undef void*
+#undef malloc
 #define malloc Hmalloc
-#undef void
+#undef free
 #define free Hfree
-#undef void*
+#undef realloc
 #define realloc Hrealloc
-#undef void
+#undef exit
 #define exit Hexit
 #endif

diff --git a/regress/hredirect.h.m4 b/regress/hredirect.h.m4
index 49a36c3127592102f7e02e7ec716c87cbc84bcc6..e192d620522fac64c5c9c4a46dedc62855c9cf9a 100644 (file)
--- a/regress/hredirect.h.m4
+++ b/regress/hredirect.h.m4
@@ -33,7 +33,7 @@ m4_include(hmacros.i4)
 hm_create_nothing
 m4_define(`hm_syscall', `#undef $1
 #define $1 H$1')
-m4_define(`hm_specsyscall',`#undef $1
+m4_define(`hm_specsyscall',`#undef $2
 #define $2 H$2')
 m4_include(`hsyscalls.i4')
 

diff --git a/src/internal.h b/src/internal.h
index 95fb6dffef4bb5548cfb42be29184f92fa15bc52..f8d443db7413e2c8fa1514cca01d1a45f9d4ef9c 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -39,6 +39,7 @@ typedef unsigned char byte;
 #include <signal.h>
 #include <errno.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <sys/time.h>
 

diff --git a/src/transmit.c b/src/transmit.c
index 3b148227ef48f87a6cc57c3fbe28155fb6fe0aa9..b0a0cdde76f314da6b0107aea16aed515e3db2b8 100644 (file)
--- a/src/transmit.c
+++ b/src/transmit.c
@@ -96,7 +96,9 @@ adns_status adns__mkquery(adns_state ads, vbuf *vb, int *id_r,
        if (!(flags & adns_qf_quoteok_query)) return adns_s_querydomaininvalid;
        if (ctype_digit(p[0])) {
          if (ctype_digit(p[1]) && ctype_digit(p[2])) {
-           c= (*p++ - '0')*100 + (*p++ - '0')*10 + (*p++ - '0');
+           c= (*p++ - '0')*100;
+           c += (*p++ - '0')*10;
+           c += (*p++ - '0');
            if (c >= 256) return adns_s_querydomaininvalid;
          } else {
            return adns_s_querydomaininvalid;