Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix trivial breakage of DBUS done by 85bc7534da

Browse Source
This commit is contained in:
Simon Kelley
2021-06-27 21:16:30 +01:00
parent a9ebbee7b6
commit 1291865c92
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dbus.c
View File

@@ -222,7 +222,6 @@ static void dbus_read_servers(DBusMessage *message)
/* unlink and free anything still marked. */ /* unlink and free anything still marked. */
cleanup_servers(); cleanup_servers();
check_servers(0);
} }
#ifdef HAVE_LOOP #ifdef HAVE_LOOP
@@ -277,7 +276,7 @@ static DBusMessage* dbus_read_servers_ex(DBusMessage *message, int strings)
{ {
const char *str = NULL; const char *str = NULL;
union mysockaddr addr, source_addr; union mysockaddr addr, source_addr;
int flags = 0; u16 flags = 0;
char interface[IF_NAMESIZE]; char interface[IF_NAMESIZE];
char *str_addr, *str_domain = NULL; char *str_addr, *str_domain = NULL;
@@ -413,8 +412,7 @@ static DBusMessage* dbus_read_servers_ex(DBusMessage *message, int strings)
} }
cleanup_servers(); cleanup_servers();
check_servers(0);
if (dup) if (dup)
free(dup); free(dup);
@@ -713,7 +711,7 @@ DBusHandlerResult message_handler(DBusConnection *connection,
if (new_servers) if (new_servers)
{ {
my_syslog(LOG_INFO, _("setting upstream servers from DBus")); my_syslog(LOG_INFO, _("setting upstream servers from DBus"));
check_servers(); check_servers(0);
if (option_bool(OPT_RELOAD)) if (option_bool(OPT_RELOAD))
clear_cache = 1; clear_cache = 1;
} }