chiark / gitweb /
network: implement masking of .link, .network and .netdev files
authorTom Gundersen <teg@jklm.no>
Sat, 19 Apr 2014 17:05:37 +0000 (19:05 +0200)
committerTom Gundersen <teg@jklm.no>
Sat, 19 Apr 2014 17:05:37 +0000 (19:05 +0200)
src/network/networkd-netdev.c
src/network/networkd-network.c
src/udev/net/link-config.c

index 717ecdf0e5a6af5dae090486efd42435cae55f1a..d503058e59c5389b58c57af573d8186d1f9b64a8 100644 (file)
@@ -475,6 +475,11 @@ static int netdev_load_one(Manager *manager, const char *filename) {
         assert(manager);
         assert(filename);
 
+        if (null_or_empty_path(filename)) {
+                log_debug("skipping empty file: %s", filename);
+                return 0;
+        }
+
         file = fopen(filename, "re");
         if (!file) {
                 if (errno == ENOENT)
index 048017e22968f000882c7716cccb31cbcc1bf123..4d01e55feeb68282912fc0a077620384e4270090 100644 (file)
@@ -44,6 +44,11 @@ static int network_load_one(Manager *manager, const char *filename) {
                         return -errno;
         }
 
+        if (null_or_empty_path(filename)) {
+                log_debug("skipping empty file: %s", filename);
+                return 0;
+        }
+
         network = new0(Network, 1);
         if (!network)
                 return log_oom();
index 8215c40d5d2cd9730353f0c61cb50dcd2b05d231..345a380d8526ccab5d29c050bcce20040d26c4ae 100644 (file)
@@ -146,6 +146,11 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
         assert(ctx);
         assert(filename);
 
+        if (null_or_empty_path(filename)) {
+                log_debug("skipping empty file: %s", filename);
+                return 0;
+        }
+
         file = fopen(filename, "re");
         if (!file) {
                 if (errno == ENOENT)