summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-02-09 02:11:24 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-02-09 02:11:24 +0000
commit31ca54aa86a90052f8fe73fda66c7f39fd5079bc (patch)
tree91bf4097b9145323fd2aee645a2a42348e33b22e /sshd.c
parente9cf357a99dcd2db14635974289e04f5f0808123 (diff)
- itojun@cvs.openbsd.org 2001/02/08 19:30:52
sync with netbsd tree changes. - more strict prototypes, include necessary headers - use paths.h/pathnames.h decls - size_t typecase to int -> u_long
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sshd.c b/sshd.c
index e3291129..22eabcda 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.163 2001/02/04 23:56:23 deraadt Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.165 2001/02/08 19:30:53 itojun Exp $");
#include <openssl/dh.h>
#include <openssl/bn.h>
@@ -211,7 +211,7 @@ sighup_handler(int sig)
* Restarts the server.
*/
void
-sighup_restart()
+sighup_restart(void)
{
log("Received SIGHUP; restarting.");
close_listen_socks();
@@ -774,7 +774,7 @@ main(int ac, char **av)
/* Disconnect from the controlling tty. */
#ifdef TIOCNOTTY
- fd = open("/dev/tty", O_RDWR | O_NOCTTY);
+ fd = open(_PATH_TTY, O_RDWR | O_NOCTTY);
if (fd >= 0) {
(void) ioctl(fd, TIOCNOTTY, NULL);
close(fd);
@@ -1347,8 +1347,8 @@ do_ssh1_kex(void)
len = BN_num_bytes(session_key_int);
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, (int)sizeof(session_key));
+ "session_key_int %d > sizeof(session_key) %lu",
+ get_remote_ipaddr(), len, (u_long)sizeof(session_key));
rsafail++;
} else {
memset(session_key, 0, sizeof(session_key));