summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2004-08-30 13:26:42 +0000
committerMatt Johnston <matt@ucc.asn.au>2004-08-30 13:26:42 +0000
commit86fc0043a94a1ca46ba7d49921b8215f531636ff (patch)
treee670d6efb13b03c2515800dda106e786dafe3901
parent415aee2c3e29405052f1ab51551baae0f7815d73 (diff)
downloaddropbear-86fc0043a94a1ca46ba7d49921b8215f531636ff.tar.gz
Load the hostkeys for inetd too - oops
-rw-r--r--svr-main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/svr-main.c b/svr-main.c
index 7dc3722..ae05c0d 100644
--- a/svr-main.c
+++ b/svr-main.c
@@ -138,9 +138,6 @@ void main_noinetd() {
commonsetup();
- /* Now we can setup the hostkeys - needs to be after logging is on,
- * otherwise we might end up blatting error messages to the socket */
- loadhostkeys();
/* should be done after syslog is working */
if (svr_opts.forkbg) {
@@ -355,6 +352,10 @@ static void commonsetup() {
if (signal(SIGSEGV, sigsegv_handler) == SIG_ERR) {
dropbear_exit("signal() error");
}
+
+ /* Now we can setup the hostkeys - needs to be after logging is on,
+ * otherwise we might end up blatting error messages to the socket */
+ loadhostkeys();
}
/* Set up listening sockets for all the requested ports */