diff options
-rw-r--r-- | CREDITS | 1 | ||||
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-pam.c | 6 | ||||
-rw-r--r-- | auth-passwd.c | 13 | ||||
-rw-r--r-- | configure.in | 24 |
5 files changed, 44 insertions, 4 deletions
@@ -21,6 +21,7 @@ David Del Piero <David.DelPiero@qed.qld.gov.au> - bug fixes | |||
21 | David Hesprich <darkgrue@gue-tech.org> - Configure fixes | 21 | David Hesprich <darkgrue@gue-tech.org> - Configure fixes |
22 | David Rankin <drankin@bohemians.lexington.ky.us> - libwrap, AIX, NetBSD fixes | 22 | David Rankin <drankin@bohemians.lexington.ky.us> - libwrap, AIX, NetBSD fixes |
23 | Gary E. Miller <gem@rellim.com> - SCO support | 23 | Gary E. Miller <gem@rellim.com> - SCO support |
24 | Ged Lodder <lodder@yacc.com.au> - HPUX fixes and enhancements | ||
24 | HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp> - Translations & doc fixes | 25 | HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp> - Translations & doc fixes |
25 | Hideaki YOSHIFUJI <yoshfuji@ecei.tohoku.ac.jp> - IPv6 fixes | 26 | Hideaki YOSHIFUJI <yoshfuji@ecei.tohoku.ac.jp> - IPv6 fixes |
26 | Hiroshi Takekawa <takekawa@sr3.t.u-tokyo.ac.jp> - Configure fixes | 27 | Hiroshi Takekawa <takekawa@sr3.t.u-tokyo.ac.jp> - Configure fixes |
@@ -1,3 +1,7 @@ | |||
1 | 20000430 | ||
2 | - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au> | ||
3 | - | ||
4 | |||
1 | 20000429 | 5 | 20000429 |
2 | - Merge big update to OpenSSH-2.0 from OpenBSD CVS | 6 | - Merge big update to OpenSSH-2.0 from OpenBSD CVS |
3 | [README.openssh2] | 7 | [README.openssh2] |
diff --git a/auth-pam.c b/auth-pam.c index e1e24854f..e3f4c4252 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include "xmalloc.h" | 13 | #include "xmalloc.h" |
14 | #include "servconf.h" | 14 | #include "servconf.h" |
15 | 15 | ||
16 | RCSID("$Id: auth-pam.c,v 1.3 2000/04/20 13:12:58 damien Exp $"); | 16 | RCSID("$Id: auth-pam.c,v 1.4 2000/04/29 14:47:29 damien Exp $"); |
17 | 17 | ||
18 | /* Callbacks */ | 18 | /* Callbacks */ |
19 | static int pamconv(int num_msg, const struct pam_message **msg, | 19 | static int pamconv(int num_msg, const struct pam_message **msg, |
@@ -226,7 +226,11 @@ void start_pam(struct passwd *pw) | |||
226 | /* Return list of PAM enviornment strings */ | 226 | /* Return list of PAM enviornment strings */ |
227 | char **fetch_pam_environment(void) | 227 | char **fetch_pam_environment(void) |
228 | { | 228 | { |
229 | #ifdef HAVE_PAM_GETENVLIST | ||
229 | return(pam_getenvlist((pam_handle_t *)pamh)); | 230 | return(pam_getenvlist((pam_handle_t *)pamh)); |
231 | #else /* HAVE_PAM_GETENVLIST */ | ||
232 | return(NULL); | ||
233 | #endif /* HAVE_PAM_GETENVLIST */ | ||
230 | } | 234 | } |
231 | 235 | ||
232 | /* Print any messages that have been generated during authentication */ | 236 | /* Print any messages that have been generated during authentication */ |
diff --git a/auth-passwd.c b/auth-passwd.c index 662f85f63..e64e65682 100644 --- a/auth-passwd.c +++ b/auth-passwd.c | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | #ifndef USE_PAM | 12 | #ifndef USE_PAM |
13 | 13 | ||
14 | RCSID("$Id: auth-passwd.c,v 1.18 2000/04/16 02:31:49 damien Exp $"); | 14 | RCSID("$Id: auth-passwd.c,v 1.19 2000/04/29 14:47:29 damien Exp $"); |
15 | 15 | ||
16 | #include "packet.h" | 16 | #include "packet.h" |
17 | #include "ssh.h" | 17 | #include "ssh.h" |
@@ -19,9 +19,12 @@ RCSID("$Id: auth-passwd.c,v 1.18 2000/04/16 02:31:49 damien Exp $"); | |||
19 | #include "xmalloc.h" | 19 | #include "xmalloc.h" |
20 | 20 | ||
21 | #ifdef WITH_AIXAUTHENTICATE | 21 | #ifdef WITH_AIXAUTHENTICATE |
22 | #include <login.h> | 22 | # include <login.h> |
23 | #endif | ||
24 | #ifdef HAVE_HPUX_TRUSTED_SYSTEM_PW | ||
25 | # include <hpsecurity.h> | ||
26 | # include <prot.h> | ||
23 | #endif | 27 | #endif |
24 | |||
25 | #ifdef HAVE_SHADOW_H | 28 | #ifdef HAVE_SHADOW_H |
26 | # include <shadow.h> | 29 | # include <shadow.h> |
27 | #endif | 30 | #endif |
@@ -108,7 +111,11 @@ auth_password(struct passwd * pw, const char *password) | |||
108 | else | 111 | else |
109 | encrypted_password = crypt(password, salt); | 112 | encrypted_password = crypt(password, salt); |
110 | #else /* HAVE_MD5_PASSWORDS */ | 113 | #else /* HAVE_MD5_PASSWORDS */ |
114 | # ifdef HAVE_HPUX_TRUSTED_SYSTEM_PW | ||
115 | encrypted_password = bigcrypt(password, salt); | ||
116 | # else | ||
111 | encrypted_password = crypt(password, salt); | 117 | encrypted_password = crypt(password, salt); |
118 | # endif /* HAVE_HPUX_TRUSTED_SYSTEM_PW */ | ||
112 | #endif /* HAVE_MD5_PASSWORDS */ | 119 | #endif /* HAVE_MD5_PASSWORDS */ |
113 | 120 | ||
114 | /* Authentication is accepted if the encrypted passwords are identical. */ | 121 | /* Authentication is accepted if the encrypted passwords are identical. */ |
diff --git a/configure.in b/configure.in index 095c96737..fbf117b94 100644 --- a/configure.in +++ b/configure.in | |||
@@ -56,6 +56,28 @@ case "$host" in | |||
56 | MANTYPE='$(CATMAN)' | 56 | MANTYPE='$(CATMAN)' |
57 | mansubdir=cat | 57 | mansubdir=cat |
58 | ;; | 58 | ;; |
59 | *-*-hpux11*) | ||
60 | if test -z "$GCC"; then | ||
61 | CFLAGS="$CFLAGS -Ae" | ||
62 | fi | ||
63 | CFLAGS="$CFLAGS -D_HPUX_SOURCE" | ||
64 | CFLAGS="$CFLAGS -I/usr/local/include" | ||
65 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | ||
66 | AC_DEFINE(IPADDR_IN_DISPLAY) | ||
67 | AC_DEFINE(USE_UTMPX) | ||
68 | AC_MSG_CHECKING(for HPUX trusted system password database) | ||
69 | if test -f /tcb/files/auth/system/default; then | ||
70 | AC_MSG_RESULT(yes) | ||
71 | AC_DEFINE(HAVE_HPUX_TRUSTED_SYSTEM_PW) | ||
72 | LIBS="$LIBS -lsec" | ||
73 | AC_MSG_WARN([This configuration is untested]) | ||
74 | else | ||
75 | AC_MSG_RESULT(no) | ||
76 | AC_DEFINE(DISABLE_SHADOW) | ||
77 | fi | ||
78 | MANTYPE='$(CATMAN)' | ||
79 | mansubdir=cat | ||
80 | ;; | ||
59 | *-*-irix5*) | 81 | *-*-irix5*) |
60 | CFLAGS="$CFLAGS -I/usr/local/include" | 82 | CFLAGS="$CFLAGS -I/usr/local/include" |
61 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 83 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
@@ -140,6 +162,8 @@ if test -z "$no_pam" -a "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then | |||
140 | AC_CHECK_LIB(dl, dlopen, , ) | 162 | AC_CHECK_LIB(dl, dlopen, , ) |
141 | LIBS="$LIBS -lpam" | 163 | LIBS="$LIBS -lpam" |
142 | 164 | ||
165 | AC_CHECK_FUNC(pam_getenvlist) | ||
166 | |||
143 | # Check PAM strerror arguments (old PAM) | 167 | # Check PAM strerror arguments (old PAM) |
144 | AC_MSG_CHECKING([whether pam_strerror takes only one argument]) | 168 | AC_MSG_CHECKING([whether pam_strerror takes only one argument]) |
145 | AC_TRY_COMPILE( | 169 | AC_TRY_COMPILE( |