diff options
Diffstat (limited to 'src/core/dns/nm-dns-dnsmasq.c')
| -rw-r--r-- | src/core/dns/nm-dns-dnsmasq.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c index f0abf564..43426882 100644 --- a/src/core/dns/nm-dns-dnsmasq.c +++ b/src/core/dns/nm-dns-dnsmasq.c @@ -39,10 +39,10 @@ #define _NMLOG(level, ...) __NMLOG_DEFAULT(level, _NMLOG_DOMAIN, "dnsmasq", __VA_ARGS__) #define WAIT_MSEC_AFTER_SIGTERM 1000 -G_STATIC_ASSERT(WAIT_MSEC_AFTER_SIGTERM <= NM_SHUTDOWN_TIMEOUT_MS); +G_STATIC_ASSERT(WAIT_MSEC_AFTER_SIGTERM <= NM_SHUTDOWN_TIMEOUT_MAX_MSEC); #define WAIT_MSEC_AFTER_SIGKILL 400 -G_STATIC_ASSERT(WAIT_MSEC_AFTER_SIGKILL + 100 <= NM_SHUTDOWN_TIMEOUT_MS_WATCHDOG); +G_STATIC_ASSERT(WAIT_MSEC_AFTER_SIGKILL + 100 <= NM_SHUTDOWN_TIMEOUT_ADDITIONAL_MSEC); typedef void (*GlPidSpawnAsyncNotify)(GCancellable *cancellable, GPid pid, @@ -848,7 +848,7 @@ static GVariant * create_update_args(NMDnsDnsmasq *self, const NMGlobalDnsConfig *global_config, const CList *ip_data_lst_head, - const char *hostname) + const char *hostdomain) { GVariantBuilder servers; const NMDnsConfigIPData *ip_data; @@ -1124,7 +1124,7 @@ static gboolean update(NMDnsPlugin *plugin, const NMGlobalDnsConfig *global_config, const CList *ip_data_lst_head, - const char *hostname, + const char *hostdomain, GError **error) { NMDnsDnsmasq *self = NM_DNS_DNSMASQ(plugin); @@ -1135,7 +1135,7 @@ update(NMDnsPlugin *plugin, nm_clear_pointer(&priv->set_server_ex_args, g_variant_unref); priv->set_server_ex_args = - g_variant_ref_sink(create_update_args(self, global_config, ip_data_lst_head, hostname)); + g_variant_ref_sink(create_update_args(self, global_config, ip_data_lst_head, hostdomain)); send_dnsmasq_update(self); return TRUE; |