diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-passwd.c | 7 | ||||
-rw-r--r-- | auth-sia.c | 2 | ||||
-rw-r--r-- | auth-sia.h | 2 | ||||
-rw-r--r-- | defines.h | 9 | ||||
-rw-r--r-- | openbsd-compat/xcrypt.c | 4 |
6 files changed, 14 insertions, 15 deletions
@@ -3,6 +3,9 @@ | |||
3 | -DUSE_POSIX_THREADS. From antoine.verheijen at ualbert ca. ok djm@ | 3 | -DUSE_POSIX_THREADS. From antoine.verheijen at ualbert ca. ok djm@ |
4 | - (dtucker) [auth-pam.c] Reset signal status when starting pam auth thread, | 4 | - (dtucker) [auth-pam.c] Reset signal status when starting pam auth thread, |
5 | prevent hanging during PAM keyboard-interactive authentications. ok djm@ | 5 | prevent hanging during PAM keyboard-interactive authentications. ok djm@ |
6 | - (dtucker) [auth-passwd.c auth-sia.c auth-sia.h defines.h | ||
7 | openbsd-compat/xcrypt.c] Bug #802: Fix build error on Tru64 when | ||
8 | configured --with-osfsia. ok djm@ | ||
6 | 9 | ||
7 | 20040303 | 10 | 20040303 |
8 | - (djm) [configure.ac ssh-agent.c] Use prctl to prevent ptrace on ssh-agent | 11 | - (djm) [configure.ac ssh-agent.c] Use prctl to prevent ptrace on ssh-agent |
@@ -851,4 +854,4 @@ | |||
851 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 854 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
852 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 855 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
853 | 856 | ||
854 | $Id: ChangeLog,v 1.3275 2004/03/04 09:03:54 dtucker Exp $ | 857 | $Id: ChangeLog,v 1.3276 2004/03/04 11:59:36 dtucker Exp $ |
diff --git a/auth-passwd.c b/auth-passwd.c index b9679abd0..beaf0fa6c 100644 --- a/auth-passwd.c +++ b/auth-passwd.c | |||
@@ -73,13 +73,6 @@ auth_password(Authctxt *authctxt, const char *password) | |||
73 | if (*password == '\0' && options.permit_empty_passwd == 0) | 73 | if (*password == '\0' && options.permit_empty_passwd == 0) |
74 | return 0; | 74 | return 0; |
75 | 75 | ||
76 | #if defined(HAVE_OSF_SIA) | ||
77 | /* | ||
78 | * XXX: any reason this is before krb? could be moved to | ||
79 | * sys_auth_passwd()? -dt | ||
80 | */ | ||
81 | return auth_sia_password(authctxt, password) && ok; | ||
82 | #endif | ||
83 | #ifdef KRB5 | 76 | #ifdef KRB5 |
84 | if (options.kerberos_authentication == 1) { | 77 | if (options.kerberos_authentication == 1) { |
85 | int ret = auth_krb5_password(authctxt, password); | 78 | int ret = auth_krb5_password(authctxt, password); |
diff --git a/auth-sia.c b/auth-sia.c index cd2dcb840..63f55d07f 100644 --- a/auth-sia.c +++ b/auth-sia.c | |||
@@ -47,7 +47,7 @@ extern int saved_argc; | |||
47 | extern char **saved_argv; | 47 | extern char **saved_argv; |
48 | 48 | ||
49 | int | 49 | int |
50 | auth_sia_password(Authctxt *authctxt, char *pass) | 50 | sys_auth_passwd(Authctxt *authctxt, char *pass) |
51 | { | 51 | { |
52 | int ret; | 52 | int ret; |
53 | SIAENTITY *ent = NULL; | 53 | SIAENTITY *ent = NULL; |
diff --git a/auth-sia.h b/auth-sia.h index 38164ff81..ca55e913e 100644 --- a/auth-sia.h +++ b/auth-sia.h | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #ifdef HAVE_OSF_SIA | 27 | #ifdef HAVE_OSF_SIA |
28 | 28 | ||
29 | int auth_sia_password(Authctxt *, char *); | 29 | int sys_auth_passwd(Authctxt *, char *); |
30 | void session_setup_sia(struct passwd *, char *); | 30 | void session_setup_sia(struct passwd *, char *); |
31 | 31 | ||
32 | #endif /* HAVE_OSF_SIA */ | 32 | #endif /* HAVE_OSF_SIA */ |
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.110 2004/02/10 02:01:14 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.111 2004/03/04 11:59:37 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -616,6 +616,13 @@ struct winsize { | |||
616 | # define USE_LASTLOG | 616 | # define USE_LASTLOG |
617 | #endif | 617 | #endif |
618 | 618 | ||
619 | #ifdef HAVE_OSF_SIA | ||
620 | # ifdef USE_SHADOW | ||
621 | # undef USE_SHADOW | ||
622 | # endif | ||
623 | # define CUSTOM_SYS_AUTH_PASSWD 1 | ||
624 | #endif | ||
625 | |||
619 | /** end of login recorder definitions */ | 626 | /** end of login recorder definitions */ |
620 | 627 | ||
621 | #endif /* _DEFINES_H */ | 628 | #endif /* _DEFINES_H */ |
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index a0fe6c620..c3cea3c86 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c | |||
@@ -24,8 +24,6 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | 26 | ||
27 | #if !defined(HAVE_OSF_SIA) | ||
28 | |||
29 | # ifdef HAVE_CRYPT_H | 27 | # ifdef HAVE_CRYPT_H |
30 | # include <crypt.h> | 28 | # include <crypt.h> |
31 | # endif | 29 | # endif |
@@ -108,5 +106,3 @@ shadow_pw(struct passwd *pw) | |||
108 | 106 | ||
109 | return pw_password; | 107 | return pw_password; |
110 | } | 108 | } |
111 | |||
112 | #endif /* !defined(HAVE_OSF_SIA) */ | ||