From c72c8958693e69e4fc3de7467f6b3083ec090ebb Mon Sep 17 00:00:00 2001 From: Andrew Sayers Date: Sun, 12 Jan 2025 14:24:35 +0000 Subject: [PATCH] Improve "no upstream servers configured" when D-Bus is enabled Print a specific INFO message instead of a generic WARNING message, so users know what to do. Starting dnsmasq without upstream servers indicates a problem by default, but is perfectly normal with D-Bus enabled. For example, NetworkManager starts dnsmasq with no upstream servers, then immediately populates it over D-Bus. --- src/dnsmasq.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/dnsmasq.c b/src/dnsmasq.c index 0422035..70ec386 100644 --- a/src/dnsmasq.c +++ b/src/dnsmasq.c @@ -962,7 +962,14 @@ int main (int argc, char **argv) my_syslog(LOG_WARNING, _("warning: ignoring resolv-file flag because no-resolv is set")); daemon->resolv_files = NULL; if (!daemon->servers) - my_syslog(LOG_WARNING, _("warning: no upstream servers configured")); + { +#ifdef HAVE_DBUS + if (option_bool(OPT_DBUS)) + my_syslog(LOG_INFO, _("no upstream servers configured - please set them from DBus")); + else +#endif + my_syslog(LOG_WARNING, _("warning: no upstream servers configured")); + } } if (daemon->max_logs != 0)