summaryrefslogtreecommitdiff
path: root/src/dnsmasq
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-11-06 11:52:05 +0100
committerThomas Haller <thaller@redhat.com>2017-11-06 12:25:23 +0100
commit45fc95f051bba70303ed66425825fa097d1b1280 (patch)
tree4b63af7042e9e5e0240d848c156ab167347b3d74 /src/dnsmasq
parent90d8e26159b1eaddf21e89195ff98f0b48cef744 (diff)
downloadNetworkManager-45fc95f051bba70303ed66425825fa097d1b1280.tar.gz
logging: configure dnsmasq's logging in shared mode via nm-logging
(cherry picked from commit cc993aa02040564c16d78c864f3c3a22d20443eb)
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 4ac1e7c350..323ef78198 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");
}