On Fri, Jan 17, 2025 at 10:47:45PM +0100, Geert Stappers wrote:
> On Sun, Jan 12, 2025 at 02:24:35PM +0000, Andrew Sayers wrote:
> > 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.
> > --- a/src/dnsmasq.c
> > +++ b/src/dnsmasq.c
> > @@ -961,7 +961,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)
> >
>
> Looks good to me.
>
> (That `git am` did complain some what, is considered "detail".)
>
And `git am` complained because the patch was already applied. :-/
Groeten
Geert Stappers
--
Silence is hard to parse
_______________________________________________
Dnsmasq-discuss mailing list
Dnsmasq-discuss@lists.thekelleys.org.uk
https://lists.thekelleys.org.uk/cgi-bin/mailman/listinfo/dnsmasq-discuss
