From 6916ec29afd488d91e7e0fcbcc2e006b4e5f28df Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 19 Apr 2014 19:05:37 +0200 Subject: [PATCH] network: implement masking of .link, .network and .netdev files --- src/network/networkd-netdev.c | 5 +++++ src/network/networkd-network.c | 5 +++++ src/udev/net/link-config.c | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c index 717ecdf0e..d503058e5 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -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) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 048017e22..4d01e55fe 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -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(); diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 8215c40d5..345a380d8 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -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) -- 2.30.2