|
Line
Link Here
|
| 0 |
-- openssh-4.2p1/auth2.c 2005-07-17 12:56:44.000000000 +0530 |
0 |
++ openssh-4.2p1-pamexpire/auth2.c 2005-09-22 15:18:31.000000000 +0530 |
|
Lines 210-215
Link Here
|
| 210 |
userauth_finish(Authctxt *authctxt, int authenticated, char *method) |
210 |
userauth_finish(Authctxt *authctxt, int authenticated, char *method) |
| 211 |
{ |
211 |
{ |
| 212 |
char *methods; |
212 |
char *methods; |
|
|
213 |
int ret; |
| 213 |
if (!authctxt->valid && authenticated) |
214 |
if (!authctxt->valid && authenticated) |
| 214 |
fatal("INTERNAL ERROR: authenticated invalid user %s", |
215 |
fatal("INTERNAL ERROR: authenticated invalid user %s", |
|
Lines 226-241
Link Here
|
| 226 |
#ifdef USE_PAM |
227 |
#ifdef USE_PAM |
| 227 |
if (options.use_pam && authenticated) { |
228 |
if (options.use_pam && authenticated) { |
| 228 |
if (!PRIVSEP(do_pam_account())) { |
229 |
ret = PRIVSEP(do_pam_account()); |
|
|
230 |
|
| 231 |
if(use_privsep) |
| 229 |
/* if PAM returned a message, send it to the user */ |
232 |
/* if PAM returned a message, send it to the user */ |
| 230 |
if (buffer_len(&loginmsg) > 0) { |
233 |
if (buffer_len(&loginmsg) > 0) { |
| 231 |
buffer_append(&loginmsg, "\0", 1); |
234 |
buffer_append(&loginmsg, "\0", 1); |
| 232 |
userauth_send_banner(buffer_ptr(&loginmsg)); |
235 |
userauth_send_banner(buffer_ptr(&loginmsg)); |
| 233 |
packet_write_wait(); |
236 |
packet_write_wait(); |
| 234 |
} |
237 |
} |
|
|
238 |
|
| 239 |
if (ret == 0) |
| 235 |
fatal("Access denied for user %s by PAM account " |
240 |
fatal("Access denied for user %s by PAM account " |
| 236 |
"configuration", authctxt->user); |
241 |
"configuration", authctxt->user); |
| 237 |
} |
242 |
|
| 238 |
} |
243 |
} |
| 239 |
#endif |
244 |
#endif |