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 @@ | |||
31 | - stevesk@cvs.openbsd.org 2001/02/04 06:30:12 | 31 | - stevesk@cvs.openbsd.org 2001/02/04 06:30:12 |
32 | [auth2.c authfd.c packet.c] | 32 | [auth2.c authfd.c packet.c] |
33 | remove duplicate #include's; ok markus@ | 33 | remove duplicate #include's; ok markus@ |
34 | - deraadt@cvs.openbsd.org 2001/02/04 16:56:23 | ||
35 | [scp.c sshd.c] | ||
36 | alpha happiness | ||
37 | - stevesk@cvs.openbsd.org 2001/02/04 15:12:17 | ||
38 | [sshd.c] | ||
39 | precedence; ok markus@ | ||
40 | - deraadt@cvs.openbsd.org 2001/02/04 08:14:15 | ||
41 | [ssh.c sshd.c] | ||
42 | make the alpha happy | ||
34 | 43 | ||
35 | 20010104 | 44 | 20010104 |
36 | - (bal) I think this is the last of the bsd-*.h that don't belong. | 45 | - (bal) I think this is the last of the bsd-*.h that don't belong. |
@@ -75,7 +75,7 @@ | |||
75 | */ | 75 | */ |
76 | 76 | ||
77 | #include "includes.h" | 77 | #include "includes.h" |
78 | RCSID("$OpenBSD: scp.c,v 1.51 2001/01/21 19:05:55 markus Exp $"); | 78 | RCSID("$OpenBSD: scp.c,v 1.53 2001/02/04 23:56:22 deraadt Exp $"); |
79 | 79 | ||
80 | #include "xmalloc.h" | 80 | #include "xmalloc.h" |
81 | #include "atomicio.h" | 81 | #include "atomicio.h" |
@@ -1164,8 +1164,8 @@ progressmeter(int flag) | |||
1164 | i++; | 1164 | i++; |
1165 | abbrevsize >>= 10; | 1165 | abbrevsize >>= 10; |
1166 | } | 1166 | } |
1167 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5d %c%c ", | 1167 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5lu %c%c ", |
1168 | (int) abbrevsize, prefixes[i], prefixes[i] == ' ' ? ' ' : 'B'); | 1168 | (unsigned long) abbrevsize, prefixes[i], prefixes[i] == ' ' ? ' ' : 'B'); |
1169 | 1169 | ||
1170 | timersub(&now, &lastupdate, &wait); | 1170 | timersub(&now, &lastupdate, &wait); |
1171 | if (cursize > lastsize) { | 1171 | if (cursize > lastsize) { |
@@ -940,7 +940,7 @@ ssh_session2_callback(int id, void *arg) | |||
940 | int len; | 940 | int len; |
941 | int interactive = 0; | 941 | int interactive = 0; |
942 | 942 | ||
943 | debug("client_init id %d arg %d", id, (int)arg); | 943 | debug("client_init id %d arg %ld", id, (long)arg); |
944 | 944 | ||
945 | if (no_shell_flag) | 945 | if (no_shell_flag) |
946 | goto done; | 946 | goto done; |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.159 2001/01/29 19:47:31 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.163 2001/02/04 23:56:23 deraadt Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -723,7 +723,7 @@ main(int ac, char **av) | |||
723 | log("Disabling protocol version 2. Could not load host key"); | 723 | log("Disabling protocol version 2. Could not load host key"); |
724 | options.protocol &= ~SSH_PROTO_2; | 724 | options.protocol &= ~SSH_PROTO_2; |
725 | } | 725 | } |
726 | if (! options.protocol & (SSH_PROTO_1|SSH_PROTO_2)) { | 726 | if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { |
727 | log("sshd: no hostkeys available -- exiting.\n"); | 727 | log("sshd: no hostkeys available -- exiting.\n"); |
728 | exit(1); | 728 | exit(1); |
729 | } | 729 | } |
@@ -1348,7 +1348,7 @@ do_ssh1_kex(void) | |||
1348 | if (len < 0 || len > sizeof(session_key)) { | 1348 | if (len < 0 || len > sizeof(session_key)) { |
1349 | error("do_connection: bad session key len from %s: " | 1349 | error("do_connection: bad session key len from %s: " |
1350 | "session_key_int %d > sizeof(session_key) %d", | 1350 | "session_key_int %d > sizeof(session_key) %d", |
1351 | get_remote_ipaddr(), len, sizeof(session_key)); | 1351 | get_remote_ipaddr(), len, (int)sizeof(session_key)); |
1352 | rsafail++; | 1352 | rsafail++; |
1353 | } else { | 1353 | } else { |
1354 | memset(session_key, 0, sizeof(session_key)); | 1354 | memset(session_key, 0, sizeof(session_key)); |