Mercurial > dropbear
changeset 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 | 78d8c3ffdfe1 (current diff) 1028b0111f89 (diff) |
| children | 55120acb9994 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/svr-authpubkey.c Thu Jan 25 18:19:49 2018 +0100 +++ b/svr-authpubkey.c Fri Feb 16 23:33:46 2018 +0800 @@ -473,12 +473,4 @@ return DROPBEAR_SUCCESS; } -#ifdef DROPBEAR_FUZZ -int fuzz_checkpubkey_line(buffer* line, int line_num, char* filename, - const char* algo, unsigned int algolen, - const unsigned char* keyblob, unsigned int keybloblen) { - return checkpubkey_line(line, line_num, filename, algo, algolen, keyblob, keybloblen); -} #endif - -#endif
--- 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);