Merge 4.2p1 to the trunk.

1 files changed, 4 insertions, 4 deletions

diff --git a/monitor.c b/monitor.c
index c751179b5..081aabbdc 100644
--- a/monitor.c
+++ b/monitor.c
@@ -875,8 +875,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;
@@ -909,8 +909,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;