Mercurial > dropbear
diff svr-main.c @ 1504:bd0bc6b5a87c
Merge branch 'master' of github.com:mkj/dropbear
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 16 Feb 2018 23:33:46 +0800 |
parents | 1028b0111f89 |
children | 47f36d8565cf |
line wrap: on
line diff
--- a/svr-main.c Thu Jan 25 18:19:49 2018 +0100 +++ b/svr-main.c Fri Feb 16 23:33:46 2018 +0800 @@ -83,6 +83,13 @@ /* Set up handlers, syslog, seed random */ commonsetup(); +#if DEBUG_TRACE + if (debug_trace) { + /* -v output goes to stderr which would get sent over the inetd network socket */ + dropbear_exit(LOG_ERR, "Dropbear inetd mode is incompatible with debug -v"); + } +#endif + /* In case our inetd was lax in logging source addresses */ get_socket_address(0, NULL, NULL, &host, &port, 0); dropbear_log(LOG_INFO, "Child connection from %s:%s", host, port);