diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-28 16:48:11 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-28 16:48:11 +0000 |
| commit | de07cbf1edd4bd1b012905c5c54aea37c6db80eb (patch) | |
| tree | 4719a6552c078d144c1a33f729f47973b070b843 | |
| parent | 68e831132128d8987462b44808fcd078ea7d83bb (diff) | |
- (bal) fix to auth2-pam.c to swap fatal() arguments, A bit of style
clean up while I'm near it.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | auth2-pam.c | 11 |
2 files changed, 10 insertions, 7 deletions
@@ -1,3 +1,7 @@ +20020629 + - (bal) fix to auth2-pam.c to swap fatal() arguments, A bit of style + clean up while I'm near it. + 20020628 - (stevesk) [sshd_config] PAMAuthenticationViaKbdInt no; commented options should contain default value. from solar. @@ -1197,4 +1201,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2311 2002/06/28 00:37:33 mouring Exp $ +$Id: ChangeLog,v 1.2312 2002/06/28 16:48:11 mouring Exp $ diff --git a/auth2-pam.c b/auth2-pam.c index 99aedeae..a2daf96b 100644 --- a/auth2-pam.c +++ b/auth2-pam.c @@ -1,5 +1,5 @@ #include "includes.h" -RCSID("$Id: auth2-pam.c,v 1.13 2002/06/26 13:58:00 djm Exp $"); +RCSID("$Id: auth2-pam.c,v 1.14 2002/06/28 16:48:12 mouring Exp $"); #ifdef USE_PAM #include <security/pam_appl.h> @@ -116,11 +116,11 @@ do_pam_conversation_kbd_int(int num_msg, const struct pam_message **msg, while(context_pam2.finished == 0) { done = 1; dispatch_run(DISPATCH_BLOCK, &done, appdata_ptr); - if(context_pam2.finished == 0) + if (context_pam2.finished == 0) debug("extra packet during conversation"); } - if(context_pam2.num_received == context_pam2.num_expected) { + if (context_pam2.num_received == context_pam2.num_expected) { *resp = context_pam2.responses; return PAM_SUCCESS; } else @@ -143,8 +143,8 @@ input_userauth_info_response_pam(int type, u_int32_t seqnr, void *ctxt) if (nresp != context_pam2.num_expected) fatal("%s: Received incorrect number of responses " - "(expected %u, received %u)", __func__, nresp, - context_pam2.num_expected); + "(expected %d, received %u)", __func__, + context_pam2.num_expected, nresp); if (nresp > 100) fatal("%s: too many replies", __func__); @@ -163,5 +163,4 @@ input_userauth_info_response_pam(int type, u_int32_t seqnr, void *ctxt) packet_check_eom(); } - #endif |