- (djm) Fix Tru64 SIA problems reported by John P Speno <speno@isc.upenn.edu>

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 <speno@isc.upenn.edu>
+
 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. */