tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX

Browse Source 
10.x by testing for conflicts in shadow.h and undef'ing _INCLUDE__STDC__
   only if a conflict is detected.
This commit is contained in:
Darren Tucker 2004-11-02 20:30:54 +11:00
parent 35beaddc7e
commit a56f191ef1
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
20041102
- (dtucker) [configure.ac includes.h] Bug #947: Fix compile error on HP-UX
10.x by testing for conflicts in shadow.h and undef'ing _INCLUDE__STDC__
only if a conflict is detected.
20041019 20041019
- (dtucker) [uidswap.c] Don't test dropping of gids for the root user or - (dtucker) [uidswap.c] Don't test dropping of gids for the root user or
on Cygwin. Cygwin parts from vinschen at redhat com; ok djm@ on Cygwin. Cygwin parts from vinschen at redhat com; ok djm@
@ -1771,4 +1776,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3561 2004/10/19 06:33:33 dtucker Exp $ $Id: ChangeLog,v 1.3562 2004/11/02 09:30:54 dtucker Exp $

21
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.231 2004/09/30 11:17:08 dtucker Exp $ # $Id: configure.ac,v 1.232 2004/11/02 09:30:54 dtucker Exp $
# #
# Copyright (c) 1999-2004 Damien Miller # Copyright (c) 1999-2004 Damien Miller
# #
@ -220,6 +220,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
AC_DEFINE(LOCKED_PASSWD_STRING, "*") AC_DEFINE(LOCKED_PASSWD_STRING, "*")
AC_DEFINE(SPT_TYPE,SPT_PSTAT) AC_DEFINE(SPT_TYPE,SPT_PSTAT)
check_for_hpux_broken_getaddrinfo=1 check_for_hpux_broken_getaddrinfo=1
check_for_conflicting_getspnam=1
LIBS="$LIBS -lsec" LIBS="$LIBS -lsec"
AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***])) AC_CHECK_LIB(xnet, t_error, ,AC_MSG_ERROR([*** -lxnet needed on HP-UX - check config.log ***]))
;; ;;
@ -1123,6 +1124,24 @@ main(void)
) )
fi 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 AC_FUNC_GETPGRP
# Check for PAM libs # Check for PAM libs

2
includes.h
View File

@ -185,7 +185,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
* On HP-UX 11.11, shadow.h and prot.h provide conflicting declarations * 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. * of getspnam when _INCLUDE__STDC__ is defined, so we unset it here.
*/ */
#ifdef __hpux #ifdef GETSPNAM_CONFLICTING_DEFS
# ifdef _INCLUDE__STDC__ # ifdef _INCLUDE__STDC__
# undef _INCLUDE__STDC__ # undef _INCLUDE__STDC__
# endif # endif