From d8cfda6bf6db6db50a4f644ad39138b7f1e3e33f Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 1 Jul 2000 12:56:09 +1000 Subject: - (djm) Fix Tru64 SIA problems reported by John P Speno --- ChangeLog | 3 +++ auth1.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea4667ad2..1d47d6c3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +20000701 + - (djm) Fix Tru64 SIA problems reported by John P Speno + 20000628 - (djm) Fixes to lastlog code for Irix - (djm) Use atomicio in loginrec diff --git a/auth1.c b/auth1.c index 0d440e521..8f2c5a804 100644 --- a/auth1.c +++ b/auth1.c @@ -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. */ -- cgit v1.2.3