Mercurial > dropbear
changeset 1501:1028b0111f89
merge
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Fri, 16 Feb 2018 23:17:48 +0800 |
| parents | 35f38af1238b (current diff) ee7153a05ffc (diff) |
| children | bd0bc6b5a87c |
| files | svr-main.c |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/svr-main.c Fri Feb 16 23:17:15 2018 +0800 +++ b/svr-main.c Fri Feb 16 23:17:48 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);