mirror of
https://github.com/clearml/dropbear
synced 2025-03-03 10:41:39 +00:00
Merge branch 'master' of github.com:mkj/dropbear
This commit is contained in:
commit
3a923b72a4
@ -473,12 +473,4 @@ static int checkfileperm(char * filename) {
|
||||
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
|
||||
|
@ -83,6 +83,13 @@ static void main_inetd() {
|
||||
/* 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);
|
||||
|
Loading…
Reference in New Issue
Block a user