diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | scp.c | 6 | ||||
| -rw-r--r-- | ssh.c | 2 | ||||
| -rw-r--r-- | sshd.c | 6 |
4 files changed, 16 insertions, 7 deletions
@@ -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. @@ -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) { @@ -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; @@ -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)); |