diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.163 2001/02/04 23:56:23 deraadt Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.165 2001/02/08 19:30:53 itojun Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -211,7 +211,7 @@ sighup_handler(int sig) | |||
211 | * Restarts the server. | 211 | * Restarts the server. |
212 | */ | 212 | */ |
213 | void | 213 | void |
214 | sighup_restart() | 214 | sighup_restart(void) |
215 | { | 215 | { |
216 | log("Received SIGHUP; restarting."); | 216 | log("Received SIGHUP; restarting."); |
217 | close_listen_socks(); | 217 | close_listen_socks(); |
@@ -774,7 +774,7 @@ main(int ac, char **av) | |||
774 | 774 | ||
775 | /* Disconnect from the controlling tty. */ | 775 | /* Disconnect from the controlling tty. */ |
776 | #ifdef TIOCNOTTY | 776 | #ifdef TIOCNOTTY |
777 | fd = open("/dev/tty", O_RDWR | O_NOCTTY); | 777 | fd = open(_PATH_TTY, O_RDWR | O_NOCTTY); |
778 | if (fd >= 0) { | 778 | if (fd >= 0) { |
779 | (void) ioctl(fd, TIOCNOTTY, NULL); | 779 | (void) ioctl(fd, TIOCNOTTY, NULL); |
780 | close(fd); | 780 | close(fd); |
@@ -1347,8 +1347,8 @@ do_ssh1_kex(void) | |||
1347 | len = BN_num_bytes(session_key_int); | 1347 | len = BN_num_bytes(session_key_int); |
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) %lu", |
1351 | get_remote_ipaddr(), len, (int)sizeof(session_key)); | 1351 | get_remote_ipaddr(), len, (u_long)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)); |