- djm@cvs.openbsd.org 2003/05/24 09:30:40

     [authfile.c monitor.c sftp-common.c sshpty.c]
     cast some types for printing; ok markus@

diff --git a/ChangeLog b/ChangeLog
index e12d1032e48d00a501ef3ccfae9d6c534a36e98d..b6bbc71e78bd957f7e1a501901a120a75893f0c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - djm@cvs.openbsd.org 2003/05/24 09:02:22
      [log.c]
      pass logged data through strnvis; ok markus
+   - djm@cvs.openbsd.org 2003/05/24 09:30:40
+     [authfile.c monitor.c sftp-common.c sshpty.c]
+     cast some types for printing; ok markus@
 
 20030524
  - (dtucker) Correct --osfsia in INSTALL.  Patch by skeleten at shillest.net

diff --git a/authfile.c b/authfile.c
index d563abb71a71ced188f2cf63e90af88f46109ff7..1f46093e3ed7a0d95f0b19a8a853beefe7e5eb6b 100644 (file)
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.53 2003/05/11 16:56:48 markus Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.54 2003/05/24 09:30:39 djm Exp $");
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -514,7 +514,7 @@ key_perm_ok(int fd, const char *filename)
                error("@         WARNING: UNPROTECTED PRIVATE KEY FILE!          @");
                error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
                error("Permissions 0%3.3o for '%s' are too open.",
-                   st.st_mode & 0777, filename);
+                   (u_int)st.st_mode & 0777, filename);
                error("It is recommended that your private key files are NOT accessible by others.");
                error("This private key will be ignored.");
                return 0;

diff --git a/monitor.c b/monitor.c
index 700925c8c5eff5727adc682905969d6fec13befe..3b7a6f8e38e7d6727f6d3cd5e060c5454d2771d1 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.40 2003/05/14 08:57:49 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.41 2003/05/24 09:30:40 djm Exp $");
 
 #include <openssl/dh.h>
 
@@ -1164,7 +1164,7 @@ mm_record_login(Session *s, struct passwd *pw)
 static void
 mm_session_close(Session *s)
 {
-       debug3("%s: session %d pid %d", __func__, s->self, s->pid);
+       debug3("%s: session %d pid %ld", __func__, s->self, (long)s->pid);
        if (s->ttyfd != -1) {
                debug3("%s: tty %s ptyfd %d",  __func__, s->tty, s->ptyfd);
                fatal_remove_cleanup(session_pty_cleanup2, (void *)s);

diff --git a/sftp-common.c b/sftp-common.c
index 31d41385bbd5df48065250822a863052900e4400..5313b134dc4710ef9e3cc051de7bef0cc93d86b4 100644 (file)
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-common.c,v 1.8 2002/10/16 14:31:48 itojun Exp $");
+RCSID("$OpenBSD: sftp-common.c,v 1.9 2003/05/24 09:30:40 djm Exp $");
 
 #include "buffer.h"
 #include "bufaux.h"
@@ -206,8 +206,8 @@ ls_file(char *name, struct stat *st, int remote)
                tbuf[0] = '\0';
        ulen = MAX(strlen(user), 8);
        glen = MAX(strlen(group), 8);
-       snprintf(buf, sizeof buf, "%s %3d %-*s %-*s %8llu %s %s", mode,
-           st->st_nlink, ulen, user, glen, group,
+       snprintf(buf, sizeof buf, "%s %3u %-*s %-*s %8llu %s %s", mode,
+           (u_int)st->st_nlink, ulen, user, glen, group,
            (unsigned long long)st->st_size, tbuf, name);
        return xstrdup(buf);
 }

diff --git a/sshpty.c b/sshpty.c
index 0cac10d3f1c543401c7a994ba1860949fbba6f9f..ee2b9d3b1aad95e50bfbf14314fb4060018f5d17 100644 (file)
--- a/sshpty.c
+++ b/sshpty.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshpty.c,v 1.8 2003/02/03 08:56:16 markus Exp $");
+RCSID("$OpenBSD: sshpty.c,v 1.9 2003/05/24 09:30:40 djm Exp $");
 
 #ifdef HAVE_UTIL_H
 # include <util.h>
@@ -409,10 +409,10 @@ pty_setowner(struct passwd *pw, const char *ttyname)
                        if (errno == EROFS &&
                            (st.st_mode & (S_IRGRP | S_IROTH)) == 0)
                                debug("chmod(%.100s, 0%o) failed: %.100s",
-                                   ttyname, mode, strerror(errno));
+                                   ttyname, (u_int)mode, strerror(errno));
                        else
                                fatal("chmod(%.100s, 0%o) failed: %.100s",
-                                   ttyname, mode, strerror(errno));
+                                   ttyname, (u_int)mode, strerror(errno));
                }
        }
 }