diff options
Diffstat (limited to 'auth-pam.c')
-rw-r--r-- | auth-pam.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/auth-pam.c b/auth-pam.c index 08b88f0dd..3f3fbf28c 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ | 32 | /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ |
33 | #include "includes.h" | 33 | #include "includes.h" |
34 | RCSID("$Id: auth-pam.c,v 1.68 2003/08/26 01:58:16 dtucker Exp $"); | 34 | RCSID("$Id: auth-pam.c,v 1.69 2003/09/02 13:12:06 djm Exp $"); |
35 | 35 | ||
36 | #ifdef USE_PAM | 36 | #ifdef USE_PAM |
37 | #include <security/pam_appl.h> | 37 | #include <security/pam_appl.h> |
@@ -199,7 +199,7 @@ sshpam_thread(void *ctxtp) | |||
199 | { | 199 | { |
200 | struct pam_ctxt *ctxt = ctxtp; | 200 | struct pam_ctxt *ctxt = ctxtp; |
201 | Buffer buffer; | 201 | Buffer buffer; |
202 | struct pam_conv sshpam_conv = { sshpam_thread_conv, ctxt }; | 202 | struct pam_conv sshpam_conv; |
203 | #ifndef USE_POSIX_THREADS | 203 | #ifndef USE_POSIX_THREADS |
204 | const char *pam_user; | 204 | const char *pam_user; |
205 | 205 | ||
@@ -207,6 +207,9 @@ sshpam_thread(void *ctxtp) | |||
207 | setproctitle("%s [pam]", pam_user); | 207 | setproctitle("%s [pam]", pam_user); |
208 | #endif | 208 | #endif |
209 | 209 | ||
210 | sshpam_conv.conv = sshpam_thread_conv; | ||
211 | sshpam_conv.appdata_ptr = ctxt; | ||
212 | |||
210 | buffer_init(&buffer); | 213 | buffer_init(&buffer); |
211 | sshpam_err = pam_set_item(sshpam_handle, PAM_CONV, | 214 | sshpam_err = pam_set_item(sshpam_handle, PAM_CONV, |
212 | (const void *)&sshpam_conv); | 215 | (const void *)&sshpam_conv); |
@@ -634,7 +637,10 @@ pam_chauthtok_conv(int n, const struct pam_message **msg, | |||
634 | void | 637 | void |
635 | do_pam_chauthtok(void) | 638 | do_pam_chauthtok(void) |
636 | { | 639 | { |
637 | struct pam_conv pam_conv = { pam_chauthtok_conv, NULL }; | 640 | struct pam_conv pam_conv; |
641 | |||
642 | pam_conv.conv = pam_chauthtok_conv; | ||
643 | pam_conv.appdata_ptr = NULL; | ||
638 | 644 | ||
639 | if (use_privsep) | 645 | if (use_privsep) |
640 | fatal("Password expired (unable to change with privsep)"); | 646 | fatal("Password expired (unable to change with privsep)"); |