- (djm) [loginrec.c ssh-rand-helper.c] Fix -Wsign-compare for portable,

   tested and fixes tim@

diff --git a/ChangeLog b/ChangeLog
index 4884236fdd84062d1bdb89db665b3fd98ba1a2b1..aea4a092d09aa786d9e8081adf3f0822bac87f90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
    polish dtucker@)
    - djm@cvs.openbsd.org 2005/06/17 02:44:33
    [auth1.c] make this -Wsign-compare clean; ok avsm@ markus@
+ - (djm) [loginrec.c ssh-rand-helper.c] Fix -Wsign-compare for portable,
+   tested and fixes tim@
 
 20050617
  - (djm) OpenBSD CVS Sync

diff --git a/configure.ac b/configure.ac
index fae6fdea9b1cd4c525ad2b2d17103c3a5bb6d453..98f0291c7307f74f453eebdc80ba8c6937449cb6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,7 @@ AC_CHECK_DECL(LLONG_MAX, have_llong_max=1, , [#include <limits.h>])
 
 if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
        CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-uninitialized"
+       CFLAGS="$CFLAGS -Wsign-compare"
 
        if test -z "$have_llong_max"; then
                # retry LLONG_MAX with -std=gnu99, needed on some Linuxes

diff --git a/loginrec.c b/loginrec.c
index 149619e47b913dc6a4af6fce7ffc9a667d67e179..bc4e278a5a6e2c87b3f106d58b332971c6033ed3 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -534,7 +534,7 @@ getlast_entry(struct logininfo *li)
  * sure dst has enough space, if not just copy src (ugh)
  */
 char *
-line_fullname(char *dst, const char *src, int dstsize)
+line_fullname(char *dst, const char *src, u_int dstsize)
 {
        memset(dst, '\0', dstsize);
        if ((strncmp(src, "/dev/", 5) == 0) || (dstsize < (strlen(src) + 5)))

diff --git a/loginrec.h b/loginrec.h
index 53607cb4bd7237b8ce79b2e46cd57257f75dfac7..a6a53c8cc4f03a74df7d623141c9f6aba53b9358 100644 (file)
--- a/loginrec.h
+++ b/loginrec.h
@@ -128,7 +128,7 @@ struct logininfo *login_get_lastlog(struct logininfo *li, const int uid);
 unsigned int login_get_lastlog_time(const int uid);
 
 /* produce various forms of the line filename */
-char *line_fullname(char *dst, const char *src, int dstsize);
+char *line_fullname(char *dst, const char *src, u_int dstsize);
 char *line_stripname(char *dst, const char *src, int dstsize);
 char *line_abbrevname(char *dst, const char *src, int dstsize);
 

diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 28c93b6f56cd9889b3a09064458d4b17ad42cff6..75db3024d2025cbcc84483ef1c444da5b519e857 100644 (file)
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -123,7 +123,7 @@ get_random_bytes_prngd(unsigned char *buf, int len,
     unsigned short tcp_port, char *socket_path)
 {
        int fd, addr_len, rval, errors;
-       char msg[2];
+       u_char msg[2];
        struct sockaddr_storage addr;
        struct sockaddr_in *addr_in = (struct sockaddr_in *)&addr;
        struct sockaddr_un *addr_un = (struct sockaddr_un *)&addr;
@@ -135,8 +135,8 @@ get_random_bytes_prngd(unsigned char *buf, int len,
        if (socket_path != NULL &&
            strlen(socket_path) >= sizeof(addr_un->sun_path))
                fatal("Random pool path is too long");
-       if (len > 255)
-               fatal("Too many bytes to read from PRNGD");
+       if (len <= 0 || len > 255)
+               fatal("Too many bytes (%d) to read from PRNGD", len);
 
        memset(&addr, '\0', sizeof(addr));
 
@@ -190,7 +190,7 @@ reopen:
                goto done;
        }
 
-       if (atomicio(read, fd, buf, len) != len) {
+       if (atomicio(read, fd, buf, len) != (size_t)len) {
                if (errno == EPIPE && errors < 10) {
                        close(fd);
                        errors++;