Mercurial > dropbear
diff svr-main.c @ 1739:13d834efc376 fuzz
merge from main
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 15 Oct 2020 19:55:15 +0800 |
parents | 6ea18ca8fc03 |
children | 2b3a8026a6ce |
line wrap: on
line diff
--- a/svr-main.c Wed Feb 28 22:11:39 2018 +0800 +++ b/svr-main.c Thu Oct 15 19:55:15 2020 +0800 @@ -80,9 +80,11 @@ static void main_inetd() { char *host, *port = NULL; - /* Set up handlers, syslog, seed random */ + /* Set up handlers, syslog */ commonsetup(); + seedrandom(); + #if DEBUG_TRACE if (debug_trace) { /* -v output goes to stderr which would get sent over the inetd network socket */ @@ -178,7 +180,7 @@ /* incoming connection select loop */ for(;;) { - FD_ZERO(&fds); + DROPBEAR_FD_ZERO(&fds); /* listening sockets */ for (i = 0; i < listensockcount; i++) { @@ -273,7 +275,7 @@ goto out; } -#ifdef DEBUG_NOFORK +#if DEBUG_NOFORK fork_ret = 0; #else fork_ret = fork(); @@ -296,11 +298,6 @@ } else { /* child */ -#ifdef DEBUG_FORKGPROF - extern void _start(void), etext(void); - monstartup((u_long)&_start, (u_long)&etext); -#endif /* DEBUG_FORKGPROF */ - getaddrstring(&remoteaddr, NULL, &remote_port, 0); dropbear_log(LOG_INFO, "Child connection from %s:%s", remote_host, remote_port); m_free(remote_host); @@ -404,8 +401,6 @@ /* Now we can setup the hostkeys - needs to be after logging is on, * otherwise we might end up blatting error messages to the socket */ load_all_hostkeys(); - - seedrandom(); } /* Set up listening sockets for all the requested ports */