summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth-pam.c10
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 @@
120040619
2 - (dtucker) [auth-pam.c] Don't use PAM namespace for
3 pam_password_change_required either.
4
120040618 520040618
2 - (djm) OpenBSD CVS Sync 6 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2004/06/17 14:52:48 7 - djm@cvs.openbsd.org 2004/06/17 14:52:48
@@ -1309,4 +1313,4 @@
1309 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1313 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1310 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1314 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1311 1315
1312$Id: ChangeLog,v 1.3414 2004/06/18 12:23:22 djm Exp $ 1316$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 @@
47 47
48/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ 48/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
49#include "includes.h" 49#include "includes.h"
50RCSID("$Id: auth-pam.c,v 1.106 2004/06/03 04:53:12 dtucker Exp $"); 50RCSID("$Id: auth-pam.c,v 1.107 2004/06/19 02:54:38 dtucker Exp $");
51 51
52#ifdef USE_PAM 52#ifdef USE_PAM
53#if defined(HAVE_SECURITY_PAM_APPL_H) 53#if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -202,7 +202,7 @@ pam_getenvlist(pam_handle_t *pamh)
202#endif 202#endif
203 203
204void 204void
205pam_password_change_required(int reqd) 205sshpam_password_change_required(int reqd)
206{ 206{
207 debug3("%s %d", __func__, reqd); 207 debug3("%s %d", __func__, reqd);
208 if (sshpam_authctxt == NULL) 208 if (sshpam_authctxt == NULL)
@@ -232,7 +232,7 @@ import_environments(Buffer *b)
232#ifndef USE_POSIX_THREADS 232#ifndef USE_POSIX_THREADS
233 /* Import variables set by do_pam_account */ 233 /* Import variables set by do_pam_account */
234 sshpam_account_status = buffer_get_int(b); 234 sshpam_account_status = buffer_get_int(b);
235 pam_password_change_required(buffer_get_int(b)); 235 sshpam_password_change_required(buffer_get_int(b));
236 236
237 /* Import environment from subprocess */ 237 /* Import environment from subprocess */
238 num_env = buffer_get_int(b); 238 num_env = buffer_get_int(b);
@@ -386,7 +386,7 @@ sshpam_thread(void *ctxtp)
386 PAM_CHANGE_EXPIRED_AUTHTOK); 386 PAM_CHANGE_EXPIRED_AUTHTOK);
387 if (sshpam_err != PAM_SUCCESS) 387 if (sshpam_err != PAM_SUCCESS)
388 goto auth_fail; 388 goto auth_fail;
389 pam_password_change_required(0); 389 sshpam_password_change_required(0);
390 } 390 }
391 } 391 }
392 392
@@ -736,7 +736,7 @@ do_pam_account(void)
736 } 736 }
737 737
738 if (sshpam_err == PAM_NEW_AUTHTOK_REQD) 738 if (sshpam_err == PAM_NEW_AUTHTOK_REQD)
739 pam_password_change_required(1); 739 sshpam_password_change_required(1);
740 740
741 sshpam_account_status = 1; 741 sshpam_account_status = 1;
742 return (sshpam_account_status); 742 return (sshpam_account_status);