Attachment 1258 Details for Bug 1299 – Check for global _res in configure.

[patch] Check for global _res in configure.

openssh-getrrsetbyname_res.patch (text/plain), 1.57 KB, created by Darren Tucker on 2007-04-10 09:47:43 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2007-04-10 09:47:43 AEST

Size: 1.57 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
>retrieving revision 1.375
>diff -u -p -r1.375 configure.ac
>--- configure.ac	26 Mar 2007 16:35:28 -0000	1.375
>+++ configure.ac	9 Apr 2007 23:39:25 -0000
>@@ -3154,6 +3154,25 @@ int main()
> 			[#include <arpa/nameser.h>])
> 	])
> 
>+AC_MSG_CHECKING(if struct __res_state _res is an extern)
>+AC_LINK_IFELSE([
>+#include <stdio.h>
>+#if HAVE_SYS_TYPES_H
>+# include <sys/types.h>
>+#endif
>+#include <netinet/in.h>
>+#include <arpa/nameser.h>
>+#include <resolv.h>
>+extern struct __res_state _res;
>+int main() { return 0; }
>+		],
>+		[AC_MSG_RESULT(yes)
>+		 AC_DEFINE(HAVE__RES_EXTERN, 1,
>+		    [Define if you have struct __res_state _res as an extern])
>+		],
>+		[ AC_MSG_RESULT(no) ]
>+)
>+
> # Check whether user wants SELinux support
> SELINUX_MSG="no"
> LIBSELINUX=""
>Index: openbsd-compat/getrrsetbyname.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/openbsd-compat/getrrsetbyname.c,v
>retrieving revision 1.23
>diff -u -p -r1.23 getrrsetbyname.c
>--- openbsd-compat/getrrsetbyname.c	19 Feb 2007 11:56:56 -0000	1.23
>+++ openbsd-compat/getrrsetbyname.c	9 Apr 2007 23:39:25 -0000
>@@ -67,13 +67,9 @@ extern int h_errno;
> #endif
> #define _THREAD_PRIVATE(a,b,c) (c)
> 
>-/* to avoid conflicts where a platform already has _res */
>-#ifdef _res
>-# undef _res
>-#endif
>-#define _res	_compat_res
>-
>+#ifndef HAVE__RES_EXTERN
> struct __res_state _res;
>+#endif
> 
> /* Necessary functions and macros */
>

Actions: View | Diff

Attachments on bug 1299: 1258