# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1518794268 -28800
# Node ID 1028b0111f89ed835e3e73277f31c0bf1bbd2f60
# Parent  35f38af1238b1dd4192c123cee8cd83eeaff5c89# Parent  ee7153a05ffcbf954cf4fcd2f8a390b96cf3da80
merge

diff -r 35f38af1238b -r 1028b0111f89 svr-main.c
--- 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);