2 files changed, 10 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 57dc1693a..42ff6f9e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040619
+ - (dtucker) [auth-pam.c] Don't use PAM namespace for
+    pam_password_change_required either.
+
 20040618
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2004/06/17 14:52:48
@@ -1309,4 +1313,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3414 2004/06/18 12:23:22 djm Exp $
+$Id: ChangeLog,v 1.3415 2004/06/19 02:54:38 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 13b334ee9..56c8d889f 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -47,7 +47,7 @@
 
 /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
 #include "includes.h"
-RCSID("$Id: auth-pam.c,v 1.106 2004/06/03 04:53:12 dtucker Exp $");
+RCSID("$Id: auth-pam.c,v 1.107 2004/06/19 02:54:38 dtucker Exp $");
 
 #ifdef USE_PAM
 #if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -202,7 +202,7 @@ pam_getenvlist(pam_handle_t *pamh)
 #endif
 
 void
-pam_password_change_required(int reqd)
+sshpam_password_change_required(int reqd)
 {
         debug3("%s %d", __func__, reqd);
         if (sshpam_authctxt == NULL)
@@ -232,7 +232,7 @@ import_environments(Buffer *b)
 #ifndef USE_POSIX_THREADS
         /* Import variables set by do_pam_account */
         sshpam_account_status = buffer_get_int(b);
-        pam_password_change_required(buffer_get_int(b));
+        sshpam_password_change_required(buffer_get_int(b));
 
         /* Import environment from subprocess */
         num_env = buffer_get_int(b);
@@ -386,7 +386,7 @@ sshpam_thread(void *ctxtp)
                             PAM_CHANGE_EXPIRED_AUTHTOK);
                         if (sshpam_err != PAM_SUCCESS)
                                 goto auth_fail;
-                        pam_password_change_required(0);
+                        sshpam_password_change_required(0);
                 }
         }
 
@@ -736,7 +736,7 @@ do_pam_account(void)
         }
 
         if (sshpam_err == PAM_NEW_AUTHTOK_REQD)
-                pam_password_change_required(1);
+                sshpam_password_change_required(1);
 
         sshpam_account_status = 1;
         return (sshpam_account_status);