X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=0ba0c75714c9eb0cb49475af307f7a70ff298695;hb=0d4ad91dd4fc831c31a9775b0eadf97fea6cd7f6;hp=9ebc2d15aaecd6bb0e6d28060c8c042e3d92397d;hpb=7f77697a1744f8df2089848b9d718faf7ba6c665;p=elogind.git

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 9ebc2d15a..0ba0c7571 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -22,7 +22,6 @@
 #include <ctype.h>
 #include <net/if.h>
 
-#include "path-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "util.h"
@@ -196,10 +195,10 @@ void network_free(Network *network) {
         free(network->filename);
 
         free(network->match_mac);
-        free(network->match_path);
-        free(network->match_driver);
-        free(network->match_type);
-        free(network->match_name);
+        strv_free(network->match_path);
+        strv_free(network->match_driver);
+        strv_free(network->match_type);
+        strv_free(network->match_name);
 
         free(network->description);
         free(network->dhcp_vendor_class_identifier);
@@ -209,6 +208,7 @@ void network_free(Network *network) {
         strv_free(network->ntp);
         strv_free(network->dns);
         strv_free(network->domains);
+        strv_free(network->bind_carrier);
 
         netdev_unref(network->bridge);
 
@@ -651,7 +651,7 @@ int config_parse_llmnr(
         return 0;
 }
 
-int config_parse_token(
+int config_parse_ipv6token(
                 const char* unit,
                 const char *filename,
                 unsigned line,
@@ -680,12 +680,12 @@ int config_parse_token(
 
         r = in_addr_is_null(AF_INET6, &buffer);
         if (r < 0) {
-                log_syntax(unit, LOG_ERR, filename, line, -r, "IPv6 token canno t be the ANY address, ignoring: %s", rvalue);
+                log_syntax(unit, LOG_ERR, filename, line, -r, "IPv6 token can not be the ANY address, ignoring: %s", rvalue);
                 return 0;
         }
 
         if ((buffer.in6.s6_addr32[0] | buffer.in6.s6_addr32[1]) != 0) {
-                log_syntax(unit, LOG_ERR, filename, line, EINVAL, "IPv6 token canno t be longer than 64 bits, ignoring: %s", rvalue);
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL, "IPv6 token can not be longer than 64 bits, ignoring: %s", rvalue);
                 return 0;
         }