- (djm) Fix OSF SIA auth NULL pointer deref. Report from Mike Battersby

   <mib@unimelb.edu.au>

diff --git a/ChangeLog b/ChangeLog
index b4c12a74f1aa68b4cc409f4dbe4412300db29acc..8ce02d61fab771a82b73ca3a4d8e049f33a85eb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
    implicit rpm-3.0.5 dependancy explicit. Patch and suggestions from 
    Pekka Savola <pekkas@netcore.fi>
  - (djm) Clean up PCRE text in INSTALL
+ - (djm) Fix OSF SIA auth NULL pointer deref. Report from Mike Battersby 
+   <mib@unimelb.edu.au>
 
 20010211
  - (bal) OpenBSD Sync

diff --git a/auth1.c b/auth1.c
index ee7aac4824b2743a8f61eea676f41c20c1998a7e..405357ba0b4eac0dd5eea0045b3ea080101530db 100644 (file)
--- a/auth1.c
+++ b/auth1.c
@@ -267,9 +267,9 @@ do_authloop(Authctxt *authctxt)
                        /* Do SIA auth with password */
                        if (sia_validate_user(NULL, saved_argc, saved_argv,
                            get_canonical_hostname(options.reverse_mapping_check),
-                           pw->pw_name, NULL, 0, NULL, password) == SIASUCCESS) {
+                           authctxt->user?authctxt->user:"NOUSER", NULL, 
+                           0, NULL, password) == SIASUCCESS)
                                authenticated = 1;
-                       }
 #else /* !USE_PAM && !HAVE_OSF_SIA */
                        /* Try authentication with the password. */
                        authenticated = auth_password(pw, password);