summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-04-29 13:58:06 +1000
committerDarren Tucker <dtucker@zip.com.au>2007-04-29 13:58:06 +1000
commitcc40d5ecdfe1bdb8f37cc385669e8b6e0b641fb2 (patch)
tree1e62165ac156b456cf84aec019f2e43b69d10812
parentd757e69cdae6bbb8c5626ff25f8f2fc151ebc98f (diff)
- (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Bug #1299: Use the
platform's _res if it has one. Should fix problem of DNSSEC record lookups on NetBSD as reported by Curt Sampson.
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac23
-rw-r--r--openbsd-compat/getrrsetbyname.c8
3 files changed, 27 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index d83e12642..a2dc43022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
2 - (dtucker) [openbsd-compat/bsd-misc.c] Include unistd.h and sys/types.h 2 - (dtucker) [openbsd-compat/bsd-misc.c] Include unistd.h and sys/types.h
3 for select(2) prototype. 3 for select(2) prototype.
4 - (dtucker) [auth-shadow.c loginrec.c] Include time.h for time(2) prototype. 4 - (dtucker) [auth-shadow.c loginrec.c] Include time.h for time(2) prototype.
5 - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Bug #1299: Use the
6 platform's _res if it has one. Should fix problem of DNSSEC record lookups
7 on NetBSD as reported by Curt Sampson.
5 8
620070406 920070406
7 - (dtucker) [INSTALL] Update the systems that have PAM as standard. Link 10 - (dtucker) [INSTALL] Update the systems that have PAM as standard. Link
@@ -2883,4 +2886,4 @@
2883 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2886 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2884 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2887 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2885 2888
2886$Id: ChangeLog,v 1.4653 2007/04/29 02:10:57 dtucker Exp $ 2889$Id: ChangeLog,v 1.4654 2007/04/29 03:58:06 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 4413ae343..4d551b897 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.375 2007/03/26 16:35:28 tim Exp $ 1# $Id: configure.ac,v 1.376 2007/04/29 03:58:07 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.375 $) 18AC_REVISION($Revision: 1.376 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -3154,6 +3154,25 @@ int main()
3154 [#include <arpa/nameser.h>]) 3154 [#include <arpa/nameser.h>])
3155 ]) 3155 ])
3156 3156
3157AC_MSG_CHECKING(if struct __res_state _res is an extern)
3158AC_LINK_IFELSE([
3159#include <stdio.h>
3160#if HAVE_SYS_TYPES_H
3161# include <sys/types.h>
3162#endif
3163#include <netinet/in.h>
3164#include <arpa/nameser.h>
3165#include <resolv.h>
3166extern struct __res_state _res;
3167int main() { return 0; }
3168 ],
3169 [AC_MSG_RESULT(yes)
3170 AC_DEFINE(HAVE__RES_EXTERN, 1,
3171 [Define if you have struct __res_state _res as an extern])
3172 ],
3173 [ AC_MSG_RESULT(no) ]
3174)
3175
3157# Check whether user wants SELinux support 3176# Check whether user wants SELinux support
3158SELINUX_MSG="no" 3177SELINUX_MSG="no"
3159LIBSELINUX="" 3178LIBSELINUX=""
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 07231d005..80af3f542 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -67,13 +67,9 @@ extern int h_errno;
67#endif 67#endif
68#define _THREAD_PRIVATE(a,b,c) (c) 68#define _THREAD_PRIVATE(a,b,c) (c)
69 69
70/* to avoid conflicts where a platform already has _res */ 70#ifndef HAVE__RES_EXTERN
71#ifdef _res
72# undef _res
73#endif
74#define _res _compat_res
75
76struct __res_state _res; 71struct __res_state _res;
72#endif
77 73
78/* Necessary functions and macros */ 74/* Necessary functions and macros */
79 75