From: dtucker <dtucker>
Date: Sat, 19 Jun 2004 02:54:38 +0000 (+0000)
Subject:  - (dtucker) [auth-pam.c] Don't use PAM namespace for
X-Git-Tag: V_3_9_P1~104
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/c10bb2cee7e308e296c36c55f97405288252fc61

 - (dtucker) [auth-pam.c] Don't use PAM namespace for
    pam_password_change_required either.
---

diff --git a/ChangeLog b/ChangeLog
index cae53357..32ab7841 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
diff --git a/auth-pam.c b/auth-pam.c
index 76801ea1..0d433539 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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);