- (djm) [monitor.c monitor_wrap.c] -Wsign-compare for PAM monitor calls

diff --git a/ChangeLog b/ChangeLog
index 0d20dbe8f98c52ca83fd98dc901fa4dc31bd552a..a6a26336e9eb9cff502d090ddfe06555b7c7e9e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,7 +24,8 @@
      knf says that a 2nd level indent is four (not three or five) spaces
  -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c]
   [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too
-
+ - (djm) [monitor.c monitor_wrap.c] -Wsign-compare for PAM monitor calls
+ 
 20050716
  - (dtucker) [auth-pam.c] Ensure that only one side of the authentication
    socketpair stays open on in both the monitor and PAM process.  Patch from

diff --git a/monitor.c b/monitor.c
index 9dca9c8034c146260017f2e04ef41de10ecc8df9..ef613cd3c5ccd6d98d283cae409987037e515481 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -869,8 +869,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;
@@ -903,8 +903,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;

diff --git a/monitor_wrap.c b/monitor_wrap.c
index afa612f4eb5dcc4d4f2b66f9ca681fa2f9a0b4ba..1489e7f08f8244609944ff6d1c1c12df01b69381 100644 (file)
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -764,7 +764,8 @@ mm_sshpam_query(void *ctx, char **name, char **info,
     u_int *num, char ***prompts, u_int **echo_on)
 {
        Buffer m;
-       int i, ret;
+       u_int i;
+       int ret;
 
        debug3("%s", __func__);
        buffer_init(&m);
@@ -790,7 +791,8 @@ int
 mm_sshpam_respond(void *ctx, u_int num, char **resp)
 {
        Buffer m;
-       int i, ret;
+       u_int i;
+       int ret;
 
        debug3("%s", __func__);
        buffer_init(&m);