RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) OSX/Darwin put the PAM headers in a different place, detect this. 

Report from jakob@
This commit is contained in:
Damien Miller 2004-01-02 18:01:30 +11:00
parent c8ec16651e
commit 0f47c53742
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,6 +2,8 @@
- (djm) OSX/Darwin needs BIND_8_COMPAT to build getrrsetbyname. Report from - (djm) OSX/Darwin needs BIND_8_COMPAT to build getrrsetbyname. Report from
jakob@ jakob@
- (djm) Remove useless DNS support configure summary message. from jakob@ - (djm) Remove useless DNS support configure summary message. from jakob@
- (djm) OSX/Darwin put the PAM headers in a different place, detect this.
Report from jakob@
20031231 20031231
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
@ -1642,4 +1644,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3160 2004/01/02 06:53:04 djm Exp $ $Id: ChangeLog,v 1.3161 2004/01/02 07:01:30 djm Exp $

6
auth-pam.c
View File

@ -31,10 +31,14 @@
/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
#include "includes.h" #include "includes.h"
RCSID("$Id: auth-pam.c,v 1.86 2003/12/18 05:08:59 dtucker Exp $"); RCSID("$Id: auth-pam.c,v 1.87 2004/01/02 07:01:31 djm Exp $");
#ifdef USE_PAM #ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H)
#include <security/pam_appl.h> #include <security/pam_appl.h>
#elif defined (HAVE_PAM_PAM_APPL_H)
#include <pam/pam_appl.h>
#endif
#include "auth.h" #include "auth.h"
#include "auth-pam.h" #include "auth-pam.h"

11
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.181 2004/01/02 06:53:04 djm Exp $ # $Id: configure.ac,v 1.182 2004/01/02 07:01:31 djm Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -499,7 +499,7 @@ int main(){exit(0);}
AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \ AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \
getopt.h glob.h ia.h lastlog.h limits.h login.h \ getopt.h glob.h ia.h lastlog.h limits.h login.h \
login_cap.h maillock.h netdb.h netgroup.h \ login_cap.h maillock.h netdb.h netgroup.h \
netinet/in_systm.h paths.h pty.h readpassphrase.h \ netinet/in_systm.h pam/pam_appl.h paths.h pty.h readpassphrase.h \
rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \ strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \
sys/cdefs.h sys/mman.h sys/pstat.h sys/select.h sys/stat.h \ sys/cdefs.h sys/mman.h sys/pstat.h sys/select.h sys/stat.h \
@ -929,7 +929,8 @@ AC_ARG_WITH(pam,
[ --with-pam Enable PAM support ], [ --with-pam Enable PAM support ],
[ [
if test "x$withval" != "xno" ; then if test "x$withval" != "xno" ; then
if test "x$ac_cv_header_security_pam_appl_h" != "xyes" ; then if test "x$ac_cv_header_security_pam_appl_h" != "xyes" && \
test "x$ac_cv_header_pam_pam_appl_h" != "xyes" ; then
AC_MSG_ERROR([PAM headers not found]) AC_MSG_ERROR([PAM headers not found])
fi fi
@ -958,7 +959,11 @@ if test "x$PAM_MSG" = "xyes" ; then
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include <stdlib.h> #include <stdlib.h>
#if defined(HAVE_SECURITY_PAM_APPL_H)
#include <security/pam_appl.h> #include <security/pam_appl.h>
#elif defined (HAVE_PAM_PAM_APPL_H)
#include <pam/pam_appl.h>
#endif
], ],
[(void)pam_strerror((pam_handle_t *)NULL, -1);], [(void)pam_strerror((pam_handle_t *)NULL, -1);],
[AC_MSG_RESULT(no)], [AC_MSG_RESULT(no)],

4
includes.h
View File

@ -147,7 +147,11 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
# include <rpc/types.h> /* For INADDR_LOOPBACK */ # include <rpc/types.h> /* For INADDR_LOOPBACK */
#endif #endif
#ifdef USE_PAM #ifdef USE_PAM
#if defined(HAVE_SECURITY_PAM_APPL_H)
# include <security/pam_appl.h> # include <security/pam_appl.h>
#elif defined (HAVE_PAM_PAM_APPL_H)
# include <pam/pam_appl.h>
#endif
#endif #endif
#ifdef HAVE_READPASSPHRASE_H #ifdef HAVE_READPASSPHRASE_H
# include <readpassphrase.h> # include <readpassphrase.h>