diff options
author | Damien Miller <djm@mindrot.org> | 2000-07-01 12:56:09 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-07-01 12:56:09 +1000 |
commit | d8cfda6bf6db6db50a4f644ad39138b7f1e3e33f (patch) | |
tree | 2f439dce13be17ee153ca5d9f8174b0a73faa717 | |
parent | b8c656e744a0a9110e5eb0ea5a6587efb181b20a (diff) |
- (djm) Fix Tru64 SIA problems reported by John P Speno <speno@isc.upenn.edu>
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | auth1.c | 7 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,6 @@ +20000701 + - (djm) Fix Tru64 SIA problems reported by John P Speno <speno@isc.upenn.edu> + 20000628 - (djm) Fixes to lastlog code for Irix - (djm) Use atomicio in loginrec @@ -310,7 +310,6 @@ do_authloop(struct passwd * pw) authenticated = auth_pam_password(pw, password); #elif defined(HAVE_OSF_SIA) /* Do SIA auth with password */ - host = get_canonical_hostname(); if (sia_validate_user(NULL, saved_argc, saved_argv, get_canonical_hostname(), pw->pw_name, NULL, 0, NULL, password) == SIASUCCESS) { @@ -505,7 +504,11 @@ do_authentication() #endif /* KRB4 */ #ifdef USE_PAM auth_pam_password(pw, "")) { -#else /* USE_PAM */ +#elif defined(HAVE_OSF_SIA) + (sia_validate_user(NULL, saved_argc, saved_argv, + get_canonical_hostname(), pw->pw_name, NULL, 0, NULL, + "") == SIASUCCESS)) { +#else /* !HAVE_OSF_SIA && !USE_PAM */ auth_password(pw, "")) { #endif /* USE_PAM */ /* Authentication with empty password succeeded. */ |