diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | openbsd-compat/getrrsetbyname.c | 4 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20030908 | ||
2 | - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and | ||
3 | _getlong in #ifndef | ||
4 | |||
1 | 20030907 | 5 | 20030907 |
2 | - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)] | 6 | - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)] |
3 | Put "which" inside quotes. | 7 | Put "which" inside quotes. |
@@ -1037,4 +1041,4 @@ | |||
1037 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1041 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1038 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1042 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1039 | 1043 | ||
1040 | $Id: ChangeLog,v 1.2969 2003/09/07 02:34:54 dtucker Exp $ | 1044 | $Id: ChangeLog,v 1.2970 2003/09/08 13:33:33 tim Exp $ |
diff --git a/configure.ac b/configure.ac index 9559bcb7e..58777a4ec 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.145 2003/09/07 02:34:54 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.146 2003/09/08 13:33:33 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -1912,6 +1912,7 @@ AC_ARG_WITH(dns, | |||
1912 | # Needed by our getrrsetbyname() | 1912 | # Needed by our getrrsetbyname() |
1913 | AC_SEARCH_LIBS(res_query, resolv) | 1913 | AC_SEARCH_LIBS(res_query, resolv) |
1914 | AC_SEARCH_LIBS(dn_expand, resolv) | 1914 | AC_SEARCH_LIBS(dn_expand, resolv) |
1915 | AC_CHECK_FUNCS(_getshort _getlong) | ||
1915 | ]) | 1916 | ]) |
1916 | fi | 1917 | fi |
1917 | ] | 1918 | ] |
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c index 3ba54e0da..3f75590e2 100644 --- a/openbsd-compat/getrrsetbyname.c +++ b/openbsd-compat/getrrsetbyname.c | |||
@@ -130,6 +130,7 @@ static int count_dns_rr(struct dns_rr *, u_int16_t, u_int16_t); | |||
130 | * Routines to insert/extract short/long's. | 130 | * Routines to insert/extract short/long's. |
131 | */ | 131 | */ |
132 | 132 | ||
133 | #ifndef HAVE__GETSHORT | ||
133 | static u_int16_t | 134 | static u_int16_t |
134 | _getshort(msgp) | 135 | _getshort(msgp) |
135 | register const u_char *msgp; | 136 | register const u_char *msgp; |
@@ -139,7 +140,9 @@ _getshort(msgp) | |||
139 | GETSHORT(u, msgp); | 140 | GETSHORT(u, msgp); |
140 | return (u); | 141 | return (u); |
141 | } | 142 | } |
143 | #endif | ||
142 | 144 | ||
145 | #ifndef HAVE__GETLONG | ||
143 | static u_int32_t | 146 | static u_int32_t |
144 | _getlong(msgp) | 147 | _getlong(msgp) |
145 | register const u_char *msgp; | 148 | register const u_char *msgp; |
@@ -149,6 +152,7 @@ _getlong(msgp) | |||
149 | GETLONG(u, msgp); | 152 | GETLONG(u, msgp); |
150 | return (u); | 153 | return (u); |
151 | } | 154 | } |
155 | #endif | ||
152 | 156 | ||
153 | int | 157 | int |
154 | getrrsetbyname(const char *hostname, unsigned int rdclass, | 158 | getrrsetbyname(const char *hostname, unsigned int rdclass, |