- deraadt@cvs.openbsd.org 2001/02/04 16:56:23

     [scp.c sshd.c]
     alpha happiness
   - stevesk@cvs.openbsd.org 2001/02/04 15:12:17
     [sshd.c]
     precedence; ok markus@
    - deraadt@cvs.openbsd.org 2001/02/04 08:14:15
     [ssh.c sshd.c]
     make the alpha happy

diff --git a/ChangeLog b/ChangeLog
index 9de105d411189c9a1fc981c62ea042b0af6e8e73..b237a21b18286c8376ad06cd052f9c48a75dfd01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,15 @@
    - stevesk@cvs.openbsd.org 2001/02/04 06:30:12
      [auth2.c authfd.c packet.c]
      remove duplicate #include's; ok markus@
+   - deraadt@cvs.openbsd.org 2001/02/04 16:56:23
+     [scp.c sshd.c]
+     alpha happiness
+   - stevesk@cvs.openbsd.org 2001/02/04 15:12:17
+     [sshd.c]
+     precedence; ok markus@
+    - deraadt@cvs.openbsd.org 2001/02/04 08:14:15
+     [ssh.c sshd.c]
+     make the alpha happy
 
 20010104
  - (bal) I think this is the last of the bsd-*.h that don't belong.

diff --git a/scp.c b/scp.c
index 7d818a5588482a636d3133bfaabf61ee02f3b968..26d4c2daa4e5a1b889f652d6e22830f3a9523895 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.51 2001/01/21 19:05:55 markus Exp $");
+RCSID("$OpenBSD: scp.c,v 1.53 2001/02/04 23:56:22 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -1164,8 +1164,8 @@ progressmeter(int flag)
                i++;
                abbrevsize >>= 10;
        }
-       snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5d %c%c ",
-           (int) abbrevsize, prefixes[i], prefixes[i] == ' ' ? ' ' : 'B');
+       snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5lu %c%c ",
+           (unsigned long) abbrevsize, prefixes[i], prefixes[i] == ' ' ? ' ' : 'B');
 
        timersub(&now, &lastupdate, &wait);
        if (cursize > lastsize) {

diff --git a/ssh.c b/ssh.c
index 5f8ae954965d844b288280ac5ea081467d115a53..454332349561400758a1811f56edcfe3537cc805 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -940,7 +940,7 @@ ssh_session2_callback(int id, void *arg)
        int len;
        int interactive = 0;
 
-       debug("client_init id %d arg %d", id, (int)arg);
+       debug("client_init id %d arg %ld", id, (long)arg);
 
        if (no_shell_flag)
                goto done;

diff --git a/sshd.c b/sshd.c
index e38d9b98692244850124851224197e03921ed8f9..e329112992a418caf50f3e90beb6ec2fa97ab49c 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.159 2001/01/29 19:47:31 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.163 2001/02/04 23:56:23 deraadt Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -723,7 +723,7 @@ main(int ac, char **av)
                log("Disabling protocol version 2. Could not load host key");
                options.protocol &= ~SSH_PROTO_2;
        }
-       if (! options.protocol & (SSH_PROTO_1|SSH_PROTO_2)) {
+       if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) {
                log("sshd: no hostkeys available -- exiting.\n");
                exit(1);
        }
@@ -1348,7 +1348,7 @@ do_ssh1_kex(void)
                if (len < 0 || len > sizeof(session_key)) {
                        error("do_connection: bad session key len from %s: "
                            "session_key_int %d > sizeof(session_key) %d",
-                           get_remote_ipaddr(), len, sizeof(session_key));
+                           get_remote_ipaddr(), len, (int)sizeof(session_key));
                        rsafail++;
                } else {
                        memset(session_key, 0, sizeof(session_key));