about summary refs log tree commit diff
path: root/src/dnsmasq
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2017-11-10 19:02:48 +0100
committerMichael Biebl <biebl@debian.org>2017-11-10 19:02:48 +0100
commit4e1c814f22fad7d608be50c06da48dc0cce5e6ab (patch)
treed09d385427d3c44eb9466947d3f594d634c70bd5 /src/dnsmasq
parent0ff08df7a88ff2db7224c42fb116760583ccc9e5 (diff)
parent417f6015c3dc8c47cf27daa59f64e0e36c521b9c (diff)
Update upstream source from tag 'upstream/1.10.0'
Update to upstream version '1.10.0'
with Debian dir af7806badea58a4a163c33d4c52e9411052b4e15
Diffstat (limited to 'src/dnsmasq')
-rw-r--r--src/dnsmasq/nm-dnsmasq-manager.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/dnsmasq/nm-dnsmasq-manager.c
index 4ac1e7c3..323ef781 100644
--- a/src/dnsmasq/nm-dnsmasq-manager.c
+++ b/src/dnsmasq/nm-dnsmasq-manager.c
@@ -175,7 +175,8 @@ create_dm_cmd_line (const char *iface,
 	cmd = nm_cmd_line_new ();
 	nm_cmd_line_add_string (cmd, dm_binary);
 
-	if (getenv ("NM_DNSMASQ_DEBUG")) {
+	if (   nm_logging_enabled (LOGL_TRACE, LOGD_SHARING)
+	    || getenv ("NM_DNSMASQ_DEBUG")) {
 		nm_cmd_line_add_string (cmd, "--log-dhcp");
 		nm_cmd_line_add_string (cmd, "--log-queries");
 	}