From 61ce036c4aa0a45cac9e8d2f1e14a9169f55c6e2 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 12 Feb 2001 18:02:23 +1100
Subject:  - (djm) Fix OSF SIA auth NULL pointer deref. Report from Mike
 Battersby    <mib@unimelb.edu.au>

---
 ChangeLog | 4 +++-
 auth1.c   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 844a71ffe..e74e712e5 100644
--- 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
@@ -3900,4 +3902,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.746 2001/02/12 00:15:41 djm Exp $
+$Id: ChangeLog,v 1.747 2001/02/12 07:02:23 djm Exp $
diff --git a/auth1.c b/auth1.c
index ee7aac482..405357ba0 100644
--- 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);
-- 
cgit v1.2.3