Merge pull request #18873 from yuwata/use-config-parse-many-and-null-or-empty-path

tree-wide: use config_parse_many() and null_or_empty_path()

man/journald.conf.xml

@@ -28,6 +28,9 @@
     <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
     <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
     <para><filename>/etc/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf</filename></para>
+    <para><filename>/etc/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf.d/*.conf</filename></para>
+    <para><filename>/run/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf.d/*.conf</filename></para>
+    <para><filename>/usr/lib/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf.d/*.conf</filename></para>
   </refsynopsisdiv>
 
   <refsect1>
@@ -41,8 +44,9 @@
 
     <para>The <command>systemd-journald</command> instance managing the default namespace is configured by
     <filename>/etc/systemd/journald.conf</filename> and associated drop-ins. Instances managing other
-    namespaces read <filename>/etc/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf</filename> with
+    namespaces read <filename>/etc/systemd/journald@<replaceable>NAMESPACE</replaceable>.conf</filename>
-    the namespace identifier filled in. This allows each namespace to carry a distinct configuration. See
+    and associated drop-ins with the namespace identifier filled in. This allows each namespace to carry
+    a distinct configuration. See
     <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     for details about journal namespaces.</para>
   </refsect1>

man/systemd.link.xml

@@ -32,23 +32,31 @@
     <citerefentry><refentrytitle>systemd.syntax</refentrytitle><manvolnum>7</manvolnum></citerefentry> for a
     general description of the syntax.</para>
 
-    <para>The link files are read from the files located in the system
+    <para>The link files are read from the files located in the system network directory
-    network directory <filename>/usr/lib/systemd/network</filename>,
+    <filename>/usr/lib/systemd/network</filename>, the volatile runtime network directory
-    the volatile runtime network directory
+    <filename>/run/systemd/network</filename>, and the local administration network directory
-    <filename>/run/systemd/network</filename>, and the local
+    <filename>/etc/systemd/network</filename>. Link files must have the extension
-    administration network directory
+    <filename>.link</filename>; other extensions are ignored. All link files are collectively sorted
-    <filename>/etc/systemd/network</filename>. Link files must have
+    and processed in lexical order, regardless of the directories in which they live. However, files
-    the extension <filename>.link</filename>; other extensions are
+    with identical filenames replace each other. Files in <filename>/etc/</filename> have the highest
-    ignored. All link files are collectively sorted and processed in
+    priority, files in <filename>/run/</filename> take precedence over files with the same name in
-    lexical order, regardless of the directories in which they live.
+    <filename>/usr/lib/</filename>. This can be used to override a system-supplied link file with a
-    However, files with identical filenames replace each other. Files
+    local file if needed. As a special case, an empty file (file size 0) or symlink with the same name
-    in <filename>/etc/</filename> have the highest priority, files in
+    pointing to <filename>/dev/null</filename> disables the configuration file entirely (it is
-    <filename>/run/</filename> take precedence over files with the same
+    "masked").</para>
-    name in <filename>/usr/lib/</filename>. This can be used to
+
-    override a system-supplied link file with a local file if needed.
+    <para>Along with the link file <filename>foo.link</filename>, a "drop-in" directory
-    As a special case, an empty file (file size 0) or symlink with the
+    <filename>foo.link.d/</filename> may exist. All files with the suffix <literal>.conf</literal>
-    same name pointing to <filename>/dev/null</filename> disables the
+    from this directory will be parsed after the file itself is parsed. This is useful to alter or add
-    configuration file entirely (it is "masked").</para>
+    configuration settings, without having to modify the main configuration file. Each drop-in file
+    must have appropriate section headers.</para>
+
+    <para>In addition to <filename>/etc/systemd/network</filename>, drop-in <literal>.d</literal>
+    directories can be placed in <filename>/usr/lib/systemd/network</filename> or
+    <filename>/run/systemd/network</filename> directories. Drop-in files in <filename>/etc/</filename>
+    take precedence over those in <filename>/run/</filename> which in turn take precedence over those
+    in <filename>/usr/lib/</filename>. Drop-in files under any of these directories take precedence
+    over the main link file wherever located.</para>
 
     <para>The link file contains a [Match] section, which determines if a given link file may be applied to a
     given device, as well as a [Link] section specifying how the device should be configured. The first (in

src/journal/journald-server.c

@@ -1625,17 +1625,19 @@ static int server_parse_config_file(Server *s) {
         assert(s);
 
         if (s->namespace) {
-                const char *namespaced;
+                const char *namespaced, *dropin_dirname;
 
                 /* If we are running in namespace mode, load the namespace specific configuration file, and nothing else */
                 namespaced = strjoina(PKGSYSCONFDIR "/journald@", s->namespace, ".conf");
+                dropin_dirname = strjoina("journald@", s->namespace, ".conf.d");
 
-                r = config_parse(NULL,
+                r = config_parse_many(
-                                 namespaced, NULL,
+                                STRV_MAKE_CONST(namespaced),
-                                 "Journal\0",
+                                (const char* const*) CONF_PATHS_STRV("systemd"),
-                                 config_item_perf_lookup, journald_gperf_lookup,
+                                dropin_dirname,
-                                 CONFIG_PARSE_WARN, s,
+                                "Journal\0",
-                                 NULL);
+                                config_item_perf_lookup, journald_gperf_lookup,
+                                CONFIG_PARSE_WARN, s, NULL);
                 if (r < 0)
                         return r;
 

src/libsystemd-network/sd-dhcp-server.c

@@ -425,66 +425,23 @@ static int server_message_init(sd_dhcp_server *server, DHCPPacket **ret,
         return 0;
 }
 
-static int server_send_offer(sd_dhcp_server *server, DHCPRequest *req,
+static int server_send_offer_or_ack(
-                             be32_t address) {
-        _cleanup_free_ DHCPPacket *packet = NULL;
-        size_t offset;
-        be32_t lease_time;
-        int r;
-
-        r = server_message_init(server, &packet, DHCP_OFFER, &offset, req);
-        if (r < 0)
-                return r;
-
-        packet->dhcp.yiaddr = address;
-
-        lease_time = htobe32(req->lifetime);
-        r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
-                               SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME, 4,
-                               &lease_time);
-        if (r < 0)
-                return r;
-
-        r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
-                               SD_DHCP_OPTION_SUBNET_MASK, 4, &server->netmask);
-        if (r < 0)
-                return r;
-
-        if (server->emit_router) {
-                r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
-                                       SD_DHCP_OPTION_ROUTER, 4, &server->address);
-                if (r < 0)
-                        return r;
-        }
-
-        r = dhcp_server_send_packet(server, req, packet, DHCP_OFFER, offset);
-        if (r < 0)
-                return r;
-
-        return 0;
-}
-
-static int server_send_ack(
                 sd_dhcp_server *server,
                 DHCPRequest *req,
-                be32_t address) {
+                be32_t address,
-
+                uint8_t type) {
-        static const uint8_t option_map[_SD_DHCP_LEASE_SERVER_TYPE_MAX] = {
-                [SD_DHCP_LEASE_DNS] = SD_DHCP_OPTION_DOMAIN_NAME_SERVER,
-                [SD_DHCP_LEASE_NTP] = SD_DHCP_OPTION_NTP_SERVER,
-                [SD_DHCP_LEASE_SIP] = SD_DHCP_OPTION_SIP_SERVER,
-                [SD_DHCP_LEASE_POP3] = SD_DHCP_OPTION_POP3_SERVER,
-                [SD_DHCP_LEASE_SMTP] = SD_DHCP_OPTION_SMTP_SERVER,
-                [SD_DHCP_LEASE_LPR] = SD_DHCP_OPTION_LPR_SERVER,
-        };
 
         _cleanup_free_ DHCPPacket *packet = NULL;
-        be32_t lease_time;
         sd_dhcp_option *j;
+        be32_t lease_time;
         size_t offset;
         int r;
 
-        r = server_message_init(server, &packet, DHCP_ACK, &offset, req);
+        assert(server);
+        assert(req);
+        assert(IN_SET(type, DHCP_OFFER, DHCP_ACK));
+
+        r = server_message_init(server, &packet, type, &offset, req);
         if (r < 0)
                 return r;
 
@@ -509,27 +466,38 @@ static int server_send_ack(
                         return r;
         }
 
-        for (sd_dhcp_lease_server_type_t k = 0; k < _SD_DHCP_LEASE_SERVER_TYPE_MAX; k++) {
+        if (type == DHCP_ACK) {
+                static const uint8_t option_map[_SD_DHCP_LEASE_SERVER_TYPE_MAX] = {
+                        [SD_DHCP_LEASE_DNS] = SD_DHCP_OPTION_DOMAIN_NAME_SERVER,
+                        [SD_DHCP_LEASE_NTP] = SD_DHCP_OPTION_NTP_SERVER,
+                        [SD_DHCP_LEASE_SIP] = SD_DHCP_OPTION_SIP_SERVER,
+                        [SD_DHCP_LEASE_POP3] = SD_DHCP_OPTION_POP3_SERVER,
+                        [SD_DHCP_LEASE_SMTP] = SD_DHCP_OPTION_SMTP_SERVER,
+                        [SD_DHCP_LEASE_LPR] = SD_DHCP_OPTION_LPR_SERVER,
+                };
 
-                if (server->servers[k].size <= 0)
+                for (sd_dhcp_lease_server_type_t k = 0; k < _SD_DHCP_LEASE_SERVER_TYPE_MAX; k++) {
-                        continue;
+                        if (server->servers[k].size <= 0)
+                                continue;
 
-                r = dhcp_option_append(
+                        r = dhcp_option_append(
-                                &packet->dhcp, req->max_optlen, &offset, 0,
+                                        &packet->dhcp, req->max_optlen, &offset, 0,
-                                option_map[k],
+                                        option_map[k],
-                                sizeof(struct in_addr) * server->servers[k].size, server->servers[k].addr);
+                                        sizeof(struct in_addr) * server->servers[k].size,
-                if (r < 0)
+                                        server->servers[k].addr);
-                        return r;
+                        if (r < 0)
-        }
+                                return r;
+                }
 
 
-        if (server->timezone) {
+                if (server->timezone) {
-                r = dhcp_option_append(
+                        r = dhcp_option_append(
-                                &packet->dhcp, req->max_optlen, &offset, 0,
+                                        &packet->dhcp, req->max_optlen, &offset, 0,
-                                SD_DHCP_OPTION_NEW_TZDB_TIMEZONE,
+                                        SD_DHCP_OPTION_NEW_TZDB_TIMEZONE,
-                                strlen(server->timezone), server->timezone);
+                                        strlen(server->timezone), server->timezone);
-                if (r < 0)
+                        if (r < 0)
-                        return r;
+                                return r;
+                }
         }
 
         ORDERED_SET_FOREACH(j, server->extra_options) {
@@ -548,7 +516,7 @@ static int server_send_ack(
                         return r;
         }
 
-        r = dhcp_server_send_packet(server, req, packet, DHCP_ACK, offset);
+        r = dhcp_server_send_packet(server, req, packet, type, offset);
         if (r < 0)
                 return r;
 
@@ -783,7 +751,7 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message,
                         /* no free addresses left */
                         return 0;
 
-                r = server_send_offer(server, req, address);
+                r = server_send_offer_or_ack(server, req, address, DHCP_OFFER);
                 if (r < 0)
                         /* this only fails on critical errors */
                         return log_dhcp_server_errno(server, r, "Could not send offer: %m");
@@ -886,7 +854,7 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message,
 
                         lease->expiration = req->lifetime * USEC_PER_SEC + time_now;
 
-                        r = server_send_ack(server, req, address);
+                        r = server_send_offer_or_ack(server, req, address, DHCP_ACK);
                         if (r < 0) {
                                 /* this only fails on critical errors */
                                 log_dhcp_server_errno(server, r, "Could not send ack: %m");

src/network/netdev/netdev.c

@@ -656,7 +656,6 @@ int netdev_join(NetDev *netdev, Link *link, link_netlink_message_handler_t callb
 
 int netdev_load_one(Manager *manager, const char *filename) {
         _cleanup_(netdev_unrefp) NetDev *netdev_raw = NULL, *netdev = NULL;
-        _cleanup_fclose_ FILE *file = NULL;
         const char *dropin_dirname;
         bool independent = false;
         int r;
@@ -664,15 +663,12 @@ int netdev_load_one(Manager *manager, const char *filename) {
         assert(manager);
         assert(filename);
 
-        file = fopen(filename, "re");
+        r = null_or_empty_path(filename);
-        if (!file) {
+        if (r == -ENOENT)
-                if (errno == ENOENT)
+                return 0;
-                        return 0;
+        if (r < 0)
-
+                return r;
-                return -errno;
+        if (r > 0) {
-        }
-
-        if (null_or_empty_fd(fileno(file))) {
                 log_debug("Skipping empty file: %s", filename);
                 return 0;
         }
@@ -714,10 +710,6 @@ int netdev_load_one(Manager *manager, const char *filename) {
                 return 0;
         }
 
-        r = fseek(file, 0, SEEK_SET);
-        if (r < 0)
-                return -errno;
-
         netdev = malloc0(NETDEV_VTABLE(netdev_raw)->object_size);
         if (!netdev)
                 return log_oom();

src/network/networkd-network.c

@@ -288,7 +288,6 @@ int network_verify(Network *network) {
 int network_load_one(Manager *manager, OrderedHashmap **networks, const char *filename) {
         _cleanup_free_ char *fname = NULL, *name = NULL;
         _cleanup_(network_unrefp) Network *network = NULL;
-        _cleanup_fclose_ FILE *file = NULL;
         const char *dropin_dirname;
         char *d;
         int r;
@@ -296,15 +295,12 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
         assert(manager);
         assert(filename);
 
-        file = fopen(filename, "re");
+        r = null_or_empty_path(filename);
-        if (!file) {
+        if (r == -ENOENT)
-                if (errno == ENOENT)
+                return 0;
-                        return 0;
+        if (r < 0)
-
+                return r;
-                return -errno;
+        if (r > 0) {
-        }
-
-        if (null_or_empty_fd(fileno(file))) {
                 log_debug("Skipping empty file: %s", filename);
                 return 0;
         }

src/shared/install.c

@@ -1335,8 +1335,8 @@ static int unit_file_load_or_readlink(
                 const char *path,
                 const char *root_dir,
                 SearchFlags flags) {
+
         _cleanup_free_ char *resolved = NULL;
-        struct stat st;
         int r;
 
         r = unit_file_load(c, info, path, root_dir, flags);
@@ -1351,9 +1351,7 @@ static int unit_file_load_or_readlink(
                  * so let's see if the path is a (possibly dangling) symlink to /dev/null. */
                 info->type = UNIT_FILE_TYPE_MASKED;
 
-        else if (r > 0 &&
+        else if (r > 0 && null_or_empty_path(resolved) > 0)
-                 stat(resolved, &st) >= 0 &&
-                 null_or_empty(&st))
 
                 info->type = UNIT_FILE_TYPE_MASKED;
 

src/udev/net/link-config.c

@@ -110,19 +110,20 @@ int link_config_ctx_new(link_config_ctx **ret) {
 
 int link_load_one(link_config_ctx *ctx, const char *filename) {
         _cleanup_(link_config_freep) link_config *link = NULL;
-        _cleanup_fclose_ FILE *file = NULL;
         _cleanup_free_ char *name = NULL;
+        const char *dropin_dirname;
         size_t i;
         int r;
 
         assert(ctx);
         assert(filename);
 
-        file = fopen(filename, "re");
+        r = null_or_empty_path(filename);
-        if (!file)
+        if (r == -ENOENT)
-                return errno == ENOENT ? 0 : -errno;
+                return 0;
-
+        if (r < 0)
-        if (null_or_empty_fd(fileno(file))) {
+                return r;
+        if (r > 0) {
                 log_debug("Skipping empty file: %s", filename);
                 return 0;
         }
@@ -151,11 +152,14 @@ int link_load_one(link_config_ctx *ctx, const char *filename) {
         for (i = 0; i < ELEMENTSOF(link->features); i++)
                 link->features[i] = -1;
 
-        r = config_parse(NULL, filename, file,
+        dropin_dirname = strjoina(basename(filename), ".d");
-                         "Match\0Link\0",
+        r = config_parse_many(
-                         config_item_perf_lookup, link_config_gperf_lookup,
+                        STRV_MAKE_CONST(filename),
-                         CONFIG_PARSE_WARN, link,
+                        (const char* const*) CONF_PATHS_STRV("systemd/network"),
-                         NULL);
+                        dropin_dirname,
+                        "Match\0Link\0",
+                        config_item_perf_lookup, link_config_gperf_lookup,
+                        CONFIG_PARSE_WARN, link, NULL);
         if (r < 0)
                 return r;