From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 15 Oct 2020 06:49:26 +0000 (+0900)
Subject: network: use string_hash_ops_free for search domains
X-Git-Tag: v247-rc1~16^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e2767720a43a3d907e565e4de62f65999a97454;p=thirdparty%2Fsystemd.git

network: use string_hash_ops_free for search domains
---

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 6bfc4cb9ebe..d31b7bca4c1 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -620,11 +620,11 @@ static Network *network_free(Network *network) {
         for (unsigned i = 0; i < network->n_dns; i++)
                 in_addr_full_free(network->dns[i]);
         free(network->dns);
-        ordered_set_free_free(network->search_domains);
-        ordered_set_free_free(network->route_domains);
+        ordered_set_free(network->search_domains);
+        ordered_set_free(network->route_domains);
         strv_free(network->bind_carrier);
 
-        ordered_set_free_free(network->router_search_domains);
+        ordered_set_free(network->router_search_domains);
         free(network->router_dns);
         set_free_free(network->ndisc_deny_listed_prefix);
 
@@ -864,8 +864,8 @@ int config_parse_domains(
         assert(rvalue);
 
         if (isempty(rvalue)) {
-                n->search_domains = ordered_set_free_free(n->search_domains);
-                n->route_domains = ordered_set_free_free(n->route_domains);
+                n->search_domains = ordered_set_free(n->search_domains);
+                n->route_domains = ordered_set_free(n->route_domains);
                 return 0;
         }
 
@@ -913,7 +913,7 @@ int config_parse_domains(
                 }
 
                 OrderedSet **set = is_route ? &n->route_domains : &n->search_domains;
-                r = ordered_set_ensure_allocated(set, &string_hash_ops);
+                r = ordered_set_ensure_allocated(set, &string_hash_ops_free);
                 if (r < 0)
                         return log_oom();
 
diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index 1167f2865f6..8949d91e2fc 100644
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -857,7 +857,7 @@ int config_parse_radv_search_domains(
                         /* transfer ownership to simplify subsequent operations */
                         idna = TAKE_PTR(w);
 
-                r = ordered_set_ensure_allocated(&n->router_search_domains, &string_hash_ops);
+                r = ordered_set_ensure_allocated(&n->router_search_domains, &string_hash_ops_free);
                 if (r < 0)
                         return log_oom();