merged OpenSSH 4.2p1 to trunk

[gssapi-openssh.git] / openssh / monitor.c

diff --git a/openssh/monitor.c b/openssh/monitor.c
index cdd74b3b0f118c339d88cbbd2adba5d6cdc732f7..98dd49b0ec9b9f4c385b256e56e61cece8d0bf18 100644 (file)
--- a/openssh/monitor.c
+++ b/openssh/monitor.c
@@ -912,8 +912,8 @@ int
 mm_answer_pam_query(int sock, Buffer *m)
 {
        char *name, *info, **prompts;
-       u_int num, *echo_on;
-       int i, ret;
+       u_int i, num, *echo_on;
+       int ret;
 
        debug3("%s", __func__);
        sshpam_authok = NULL;
@@ -946,8 +946,8 @@ int
 mm_answer_pam_respond(int sock, Buffer *m)
 {
        char **resp;
-       u_int num;
-       int i, ret;
+       u_int i, num;
+       int ret;
 
        debug3("%s", __func__);
        sshpam_authok = NULL;