fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 13:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns: sd-resolved: fix hash table iteration

Browse source 
g_hash_table_iter_next() wants a (gpointer *), not an (int *).

Fixes: f70ee67058 ('dns: sd-resolved: reset interface configuration on deactivation')
(cherry picked from commit 526b484be1)
(cherry picked from commit dedcba61ef)
(cherry picked from commit b42696d70b)
This commit is contained in:
Beniamino Galvani 2020-11-30 22:32:33 +01:00
parent c5682f736f
commit 1ea72435da
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dns/nm-dns-systemd-resolved.c
View file

@ -358,6 +358,7 @@ update (NMDnsPlugin *plugin,
gs_free gpointer *interfaces_keys = NULL; gs_free gpointer *interfaces_keys = NULL;
guint interfaces_len; guint interfaces_len;
int ifindex; int ifindex;
gpointer pointer;
NMDnsIPConfigData *ip_data; NMDnsIPConfigData *ip_data;
GHashTableIter iter; GHashTableIter iter;
guint i; guint i;
@ -402,7 +403,8 @@ update (NMDnsPlugin *plugin,
* resolved, and the current update doesn't contain that interface, * resolved, and the current update doesn't contain that interface,
* reset the resolved configuration for that ifindex. */ * reset the resolved configuration for that ifindex. */
g_hash_table_iter_init (&iter, priv->dirty_interfaces); g_hash_table_iter_init (&iter, priv->dirty_interfaces);
while (g_hash_table_iter_next (&iter, (gpointer *) &ifindex, NULL)) { while (g_hash_table_iter_next (&iter, (gpointer *) &pointer, NULL)) {
ifindex = GPOINTER_TO_INT (pointer);
if (!g_hash_table_contains (interfaces, GINT_TO_POINTER (ifindex))) { if (!g_hash_table_contains (interfaces, GINT_TO_POINTER (ifindex))) {
InterfaceConfig ic; InterfaceConfig ic;