Attachment 736 Details for Bug 947 – Check for conflicting getspnam declarations at configure time.

[patch] Check for conflicting getspnam declarations at configure time.

openssh-hpux-conflict.patch (text/plain), 1.57 KB, created by Darren Tucker on 2004-10-31 19:21:53 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2004-10-31 19:21:53 AEDT

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.231
>diff -u -r1.231 configure.ac
>--- configure.ac	30 Sep 2004 11:17:08 -0000	1.231
>+++ configure.ac	31 Oct 2004 08:16:16 -0000
>@@ -220,6 +220,7 @@
> 	AC_DEFINE(LOCKED_PASSWD_STRING, "*")
> 	AC_DEFINE(SPT_TYPE,SPT_PSTAT)
> 	check_for_hpux_broken_getaddrinfo=1
>+	check_for_conflicting_getspnam=1
> 	LIBS="$LIBS -lsec"
> 	AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***]))
> 	;;
>@@ -1123,6 +1124,24 @@
> 	)
> fi
> 
>+if test "x$check_for_conflicting_getspnam" = "x1"; then
>+	AC_MSG_CHECKING(for conflicting getspnam in shadow.h)
>+	AC_COMPILE_IFELSE(
>+		[
>+#include <shadow.h>
>+int main(void) {exit(0);}
>+		],
>+		[
>+			AC_MSG_RESULT(no)
>+		],
>+		[
>+			AC_MSG_RESULT(yes)
>+			AC_DEFINE(GETSPNAM_CONFLICTING_DEFS, 1,
>+			    [Conflicting defs for getspnam])
>+		]
>+	)
>+fi
>+
> AC_FUNC_GETPGRP
> 
> # Check for PAM libs
>Index: includes.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/includes.h,v
>retrieving revision 1.72
>diff -u -r1.72 includes.h
>--- includes.h	14 Aug 2004 14:01:48 -0000	1.72
>+++ includes.h	31 Oct 2004 06:24:46 -0000
>@@ -185,7 +185,7 @@
>  * On HP-UX 11.11, shadow.h and prot.h provide conflicting declarations
>  * of getspnam when _INCLUDE__STDC__ is defined, so we unset it here.
>  */
>-#ifdef __hpux
>+#ifdef GETSPNAM_CONFLICTING_DEFS
> # ifdef _INCLUDE__STDC__
> #  undef _INCLUDE__STDC__
> # endif

Actions: View | Diff

Attachments on bug 947: 736