From bcb88d540e1d555e35f84e6865e1c6adb6992290 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 3 Jun 2016 11:56:59 +0200 Subject: [PATCH] dns: minor fix of logging with unset dns mode With [main] #dns= we would see in the log: dns-mgr: init: dns=(null), rc-manager=symlink Instead, it should be dns-mgr: init: dns=default, rc-manager=symlink Also, we should avoid logging NULL values with "%s", although glib's printf is fine with that. --- src/dns-manager/nm-dns-manager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 8690be8a36..6c29bd390f 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -1617,8 +1617,9 @@ again: plugin_changed = TRUE; } } else { - if (!NM_IN_STRSET (mode, NULL, "none", "default")) { - _LOGW ("init: unknown dns mode '%s'", mode); + if (!NM_IN_STRSET (mode, "none", "default")) { + if (mode) + _LOGW ("init: unknown dns mode '%s'", mode); mode = "default"; } if (_clear_plugin (self))