Merge branch 'master' of github.com:mkj/dropbear

2 files changed, 7 insertions, 8 deletions

diff --git a/svr-authpubkey.c b/svr-authpubkey.c
index 8905ac9..aa6087c 100644
--- a/svr-authpubkey.c
+++ b/svr-authpubkey.c
@@ -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
diff --git a/svr-main.c b/svr-main.c
index 0efbd26..a7e447e 100644
--- a/svr-main.c
+++ b/svr-main.c
@@ -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);