diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-01-25 20:33:47 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-01-26 14:42:03 +0100 |
| commit | 482d1aeb671e813535f0ff9fadf4e1827ee32e20 (patch) | |
| tree | aa3d84391e7400fe35e5ba124df95f49ebcec7ce | |
| parent | 0061695507e889069c0c974cf85cd570f7ec9a88 (diff) | |
networkd: when filtering out duplicate domain names use DNS comparison
When we collect the domain names of the various links and other sources in one ordered set, make sure to use proper DNS
name comparison to filter out duplicates.
| -rw-r--r-- | src/network/networkd-manager.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index 7b801ae6c9..e8d4b042d4 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -29,6 +29,7 @@ #include "bus-util.h" #include "conf-parser.h" #include "def.h" +#include "dns-domain.h" #include "fd-util.h" #include "fileio.h" #include "libudev-private.h" @@ -852,11 +853,11 @@ static int manager_save(Manager *m) { if (!ntp) return -ENOMEM; - search_domains = ordered_set_new(&string_hash_ops); + search_domains = ordered_set_new(&dns_name_hash_ops); if (!search_domains) return -ENOMEM; - route_domains = ordered_set_new(&string_hash_ops); + route_domains = ordered_set_new(&dns_name_hash_ops); if (!route_domains) return -ENOMEM; |