summaryrefslogtreecommitdiff
path: root/auth-pam.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-19 12:54:38 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-19 12:54:38 +1000
commit17db1c47cf1e06dc6e48425cbb41c38a62d54ad2 (patch)
tree6aecc2b36b04c312709aa778c6c25c849579814c /auth-pam.c
parent3bbd878c2ec2b337b9e5b9455e0a2bd1902a0824 (diff)
- (dtucker) [auth-pam.c] Don't use PAM namespace for
pam_password_change_required either.
Diffstat (limited to 'auth-pam.c')
-rw-r--r--auth-pam.c10
1 files changed, 5 insertions, 5 deletions
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);