o Merge changes from OPENSSH_3_5P1_GSI_20021018.

[gssapi-openssh.git] / openssh / auth2-pam.c

diff --git a/openssh/auth2-pam.c b/openssh/auth2-pam.c
index b2bfa8130649958de564f64fcfebed434f1f5af0..9decbb6a43ca542a7f5ebc4682724041675d4a35 100644 (file)
--- a/openssh/auth2-pam.c
+++ b/openssh/auth2-pam.c
@@ -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