man/integritytab.xml

@@ -55,8 +55,8 @@
 
     <para>The third field if present contains an absolute filename path to a key file or a <literal>-</literal>
     to specify none.  When the filename is present, the "integrity-algorithm" defaults to <literal>hmac-sha256</literal>
-    with the key length derived from the number of bytes in the key file.  At this time the only supported integrity algorithms
+    with the key length derived from the number of bytes in the key file.  At this time the only supported integrity algorithm
-    when using key file are hmac-sha256, hmac-sha512, phmac-sha256, and hmac-sha512.  The maximum size of the key file is 4096 bytes.
+    when using key file is hmac-sha256.  The maximum size of the key file is 4096 bytes.
     </para>
 
      <para>The fourth field, if present, is a comma-delimited list of options or a <literal>-</literal> to specify none. The following options are
@@ -125,7 +125,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>integrity-algorithm=[crc32c|crc32|xxhash64|sha1|sha256|hmac-sha256|hmac-sha512|phmac-sha256|phmac-sha512]</option></term>
+        <term><option>integrity-algorithm=[crc32c|crc32|xxhash64|sha1|sha256|hmac-sha256]</option></term>
 
         <listitem><para>
         The algorithm used for integrity checking.  The default is crc32c. Must match option used during format.

man/systemd.network.xml

@@ -4227,25 +4227,6 @@ ServerAddress=192.168.0.1/24</programlisting>
 
         <xi:include href="version-info.xml" xpointer="v249"/></listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term><varname>Hostname=</varname></term>
-
-        <listitem><para>The hostname to send to the client in DHCP replies. This can be either a simple
-        hostname (e.g., <literal>mydevice</literal>) or a fully qualified domain name (e.g.,
-        <literal>mydevice.example.com</literal>), following RFC 1123 naming conventions. Each label can be
-        up to 63 characters, with a total maximum length of 253 characters for FQDNs. When this option is
-        set, the DHCP server will include the hostname in DHCP replies (both OFFER and ACK) to the client
-        with the matched MAC address.</para>
-
-        <para>The server automatically selects the appropriate DHCP option based on the hostname format:
-        simple hostnames (single DNS label) are sent via option 12 (Host Name) per RFC 2132, while FQDNs
-        with multiple labels are sent via option 81 (Client FQDN) per RFC 4702 using DNS wire format
-        encoding. The configured hostname is sent unconditionally, any hostname requested by the client in
-        its DHCP message is ignored.</para>
-
-        <xi:include href="version-info.xml" xpointer="v259"/></listitem>
-      </varlistentry>
     </variablelist>
   </refsect1>
 

src/basic/efivars.c

@@ -68,7 +68,6 @@ int efi_get_variable(
 
                 if (fstat(fd, &st) < 0)
                         return log_debug_errno(errno, "fstat(\"%s\") failed: %m", p);
-
                 r = stat_verify_regular(&st);
                 if (r < 0)
                         return log_debug_errno(r, "EFI variable '%s' is not a regular file, refusing: %m", p);

src/include/musl/ftw.h

@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include_next <ftw.h>
-
-#ifndef FTW_CONTINUE
-#define FTW_CONTINUE 0
-#endif

src/include/musl/gnu/libc-version.h

@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include <stddef.h>
-
-static inline const char* gnu_get_libc_version(void) {
-        return "";
-}

src/include/musl/gshadow.h

@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include <errno.h>
-#include <stddef.h>
-
-struct sgrp {
-        char *sg_namp;
-        char *sg_passwd;
-        char **sg_adm;
-        char **sg_mem;
-};
-
-static inline int getsgnam_r(
-                const char *__name,
-                struct sgrp *__result_buf,
-                char *__buffer,
-                size_t __buflen,
-                struct sgrp **__result) {
-
-        return EOPNOTSUPP; /* this function returns positive errno in case of error. */
-}

src/include/musl/malloc.h

@@ -1,39 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include <errno.h>
-#include <stdio.h>
-
-/* struct mallinfo2 will be defined and struct mallinfo is converted to struct mallinfo2 in
- * override/malloc.h. Hence, here we define struct mallinfo. */
-
-struct mallinfo {
-        int arena;    /* non-mmapped space allocated from system */
-        int ordblks;  /* number of free chunks */
-        int smblks;   /* number of fastbin blocks */
-        int hblks;    /* number of mmapped regions */
-        int hblkhd;   /* space in mmapped regions */
-        int usmblks;  /* always 0, preserved for backwards compatibility */
-        int fsmblks;  /* space available in freed fastbin blocks */
-        int uordblks; /* total allocated space */
-        int fordblks; /* total free space */
-        int keepcost; /* top-most, releasable (via malloc_trim) space */
-};
-
-static inline struct mallinfo mallinfo(void) {
-        return (struct mallinfo) {};
-}
-
-static inline int malloc_info(int options, FILE *stream) {
-        if (options != 0)
-                errno = EINVAL;
-        else
-                errno = EOPNOTSUPP;
-        return -1;
-}
-
-static inline int malloc_trim(size_t pad) {
-        return 0;
-}
-
-#include_next <malloc.h>

src/include/musl/netinet/if_ether.h

@@ -1,33 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-/* glibc's netinet/if_ether.h does the following:
- * - include linux/if_ether.h, net/ethernet.h, and net/if_arp.h,
- * - define struct ether_arp, and relevant macros,
- * - define ETHER_MAP_IP_MULTICAST() macro (currently we do not use it).
- * However, musl's netinet/if_ether.h conflicts with linux/if_ether.h.
- * Let's use the same way that glibc uses. */
-
-#include <linux/if_ether.h>     /* IWYU pragma: export */
-#include <net/ethernet.h>       /* IWYU pragma: export */
-#include <net/if_arp.h>         /* IWYU pragma: export */
-
-/*
- * Ethernet Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  Structure below is adapted
- * to resolving internet addresses.  Field names used correspond to
- * RFC 826.
- */
-struct  ether_arp {
-        struct  arphdr ea_hdr;          /* fixed-size header */
-        uint8_t arp_sha[ETH_ALEN];      /* sender hardware address */
-        uint8_t arp_spa[4];             /* sender protocol address */
-        uint8_t arp_tha[ETH_ALEN];      /* target hardware address */
-        uint8_t arp_tpa[4];             /* target protocol address */
-};
-#define arp_hrd ea_hdr.ar_hrd
-#define arp_pro ea_hdr.ar_pro
-#define arp_hln ea_hdr.ar_hln
-#define arp_pln ea_hdr.ar_pln
-#define arp_op  ea_hdr.ar_op

src/include/musl/sys/prctl.h

@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include_next <sys/prctl.h>     /* IWYU pragma: export */
-
-/* musl's sys/prctl.h does not include linux/prctl.h, and also we cannot include with linux/prctl.h.
- * Hence, we need to provide some missing definitions. */
-
-#ifndef PR_SET_MDWE
-#define PR_SET_MDWE  65
-#endif
-
-#ifndef PR_MDWE_REFUSE_EXEC_GAIN
-#define PR_MDWE_REFUSE_EXEC_GAIN  (1UL << 0)
-#endif
-
-#ifndef PR_SET_MEMORY_MERGE
-#define PR_SET_MEMORY_MERGE  67
-#endif

src/include/musl/sys/stat.h

@@ -1,66 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include_next <sys/stat.h>
-
-#include <assert.h>
-#include <stddef.h>
-
-/* musl's sys/stat.h does not include linux/stat.h, and unfortunately they conflict with each other.
- * Hence, some relatively new macros need to be explicitly defined here. */
-
-/* Before 23ab04a8630225371455d5f4538fd078665bb646, statx.stx_mnt_id is not defined. */
-#ifndef STATX_MNT_ID
-static_assert(offsetof(struct statx, __pad1) == offsetof(struct statx, stx_dev_minor) + sizeof(uint32_t), "");
-#define stx_mnt_id __pad1[0]
-#endif
-
-#ifndef STATX_MNT_ID
-#define STATX_MNT_ID            0x00001000U
-#endif
-#ifndef STATX_DIOALIGN
-#define STATX_DIOALIGN          0x00002000U
-#endif
-#ifndef STATX_MNT_ID_UNIQUE
-#define STATX_MNT_ID_UNIQUE     0x00004000U
-#endif
-#ifndef STATX_SUBVOL
-#define STATX_SUBVOL            0x00008000U
-#endif
-#ifndef STATX_WRITE_ATOMIC
-#define STATX_WRITE_ATOMIC      0x00010000U
-#endif
-#ifndef STATX_DIO_READ_ALIGN
-#define STATX_DIO_READ_ALIGN    0x00020000U
-#endif
-
-#ifndef STATX_ATTR_COMPRESSED
-#define STATX_ATTR_COMPRESSED   0x00000004
-#endif
-#ifndef STATX_ATTR_IMMUTABLE
-#define STATX_ATTR_IMMUTABLE    0x00000010
-#endif
-#ifndef STATX_ATTR_APPEND
-#define STATX_ATTR_APPEND       0x00000020
-#endif
-#ifndef STATX_ATTR_NODUMP
-#define STATX_ATTR_NODUMP       0x00000040
-#endif
-#ifndef STATX_ATTR_ENCRYPTED
-#define STATX_ATTR_ENCRYPTED    0x00000800
-#endif
-#ifndef STATX_ATTR_AUTOMOUNT
-#define STATX_ATTR_AUTOMOUNT    0x00001000
-#endif
-#ifndef STATX_ATTR_MOUNT_ROOT
-#define STATX_ATTR_MOUNT_ROOT   0x00002000
-#endif
-#ifndef STATX_ATTR_VERITY
-#define STATX_ATTR_VERITY       0x00100000
-#endif
-#ifndef STATX_ATTR_DAX
-#define STATX_ATTR_DAX          0x00200000
-#endif
-#ifndef STATX_ATTR_WRITE_ATOMIC
-#define STATX_ATTR_WRITE_ATOMIC 0x00400000
-#endif

src/integritysetup/integrity-util.c

@@ -11,7 +11,7 @@
 #include "time-util.h"
 
 static int supported_integrity_algorithm(char *user_supplied) {
-        if (!STR_IN_SET(user_supplied, "crc32", "crc32c", "xxhash64", "sha1", "sha256", "hmac-sha256", "hmac-sha512", "phmac-sha256", "phmac-sha512"))
+        if (!STR_IN_SET(user_supplied, "crc32", "crc32c", "xxhash64", "sha1", "sha256", "hmac-sha256"))
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unsupported integrity algorithm (%s)", user_supplied);
         return 0;
 }

src/integritysetup/integrity-util.h

@@ -12,7 +12,4 @@ int parse_integrity_options(
                 char **ret_integrity_alg);
 
 #define DM_HMAC_256 "hmac(sha256)"
-#define DM_HMAC_512 "hmac(sha512)"
-#define DM_PHMAC_256 "phmac(sha256)"
-#define DM_PHMAC_512 "phmac(sha512)"
 #define DM_MAX_KEY_SIZE 4096            /* Maximum size of key allowed for dm-integrity */

src/integritysetup/integritysetup.c

@@ -77,12 +77,6 @@ static const char *integrity_algorithm_select(const void *key_file_buf) {
         if (arg_integrity_algorithm) {
                 if (streq("hmac-sha256", arg_integrity_algorithm))
                         return DM_HMAC_256;
-                if (streq("hmac-sha512", arg_integrity_algorithm))
-                        return DM_HMAC_512;
-                if (streq("phmac-sha256", arg_integrity_algorithm))
-                        return DM_PHMAC_256;
-                if (streq("phmac-sha512", arg_integrity_algorithm))
-                        return DM_PHMAC_512;
                 return arg_integrity_algorithm;
         } else if (key_file_buf)
                 return DM_HMAC_256;

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

@@ -57,10 +57,8 @@ static int add_static_lease(sd_dhcp_server *server, uint8_t i) {
 
         return sd_dhcp_server_set_static_lease(
                                 server,
-                        &(struct in_addr) { .s_addr = htobe32(UINT32_C(10) << 24 | i) },
+                                &(struct in_addr) { .s_addr = htobe32(UINT32_C(10) << 24 | i)},
-                        id,
+                                id, ELEMENTSOF(id));
-                        ELEMENTSOF(id),
-                        /* hostname= */ NULL);
 }
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {

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

@@ -505,60 +505,6 @@ static int lease_parse_domain(const uint8_t *option, size_t len, char **ret) {
         return 0;
 }
 
-static int lease_parse_fqdn(const uint8_t *option, size_t len, char **hostname) {
-        _cleanup_free_ char *name = NULL, *normalized = NULL;
-        int r;
-
-        assert(option);
-        assert(hostname);
-
-        /* RFC 4702 Section 2
-         *
-         * Byte 0: Flags (S: server should perform A RR updates, O: override existing A RR,
-         *                E: encoding (0=ASCII, 1=Wire format), N: no server updates)
-         * Byte 1: RCODE1 (ignored on receipt)
-         * Byte 2: RCODE2 (ignored on receipt)
-         * Bytes 3+: Domain Name */
-
-        if (len <= 3)
-                return -EBADMSG;
-
-        size_t data_len = len - 3;
-        const uint8_t *data = option + 3;
-
-        /* In practice, many servers send DNS wire format regardless of the E flag, so ignore and try wire
-         * format first, then fall back to ASCII if that fails. */
-        r = dns_name_from_wire_format(&data, &data_len, &name);
-        if (r < 0) {
-                if (FLAGS_SET(option[0], DHCP_FQDN_FLAG_E))
-                        return -EBADMSG;
-
-                /* Wire format failed, try ASCII format */
-                r = dhcp_option_parse_string(option + 3, len - 3, &name);
-                if (r < 0)
-                        return r;
-        }
-
-        if (!name) {
-                *hostname = mfree(*hostname);
-                return 0;
-        }
-
-        r = dns_name_normalize(name, 0, &normalized);
-        if (r < 0)
-                return r;
-
-        if (is_localhost(normalized))
-                return -EINVAL;
-
-        if (dns_name_is_root(normalized))
-                return -EINVAL;
-
-        free_and_replace(*hostname, normalized);
-
-        return 0;
-}
-
 static int lease_parse_captive_portal(const uint8_t *option, size_t len, char **ret) {
         _cleanup_free_ char *uri = NULL;
         int r;
@@ -1021,12 +967,6 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
                 break;
 
         case SD_DHCP_OPTION_HOST_NAME:
-                /* FQDN option (81) always takes precedence. If it was already set, do not overwrite it. */
-                if (lease->hostname) {
-                        log_debug("Hostname already set via FQDN, ignoring hostname option.");
-                        break;
-                }
-
                 r = lease_parse_domain(option, len, &lease->hostname);
                 if (r < 0) {
                         log_debug_errno(r, "Failed to parse hostname, ignoring: %m");
@@ -1035,15 +975,6 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
 
                 break;
 
-        case SD_DHCP_OPTION_FQDN:
-                r = lease_parse_fqdn(option, len, &lease->hostname);
-                if (r < 0) {
-                        log_debug_errno(r, "Failed to parse FQDN, ignoring: %m");
-                        return 0;
-                }
-
-                break;
-
         case SD_DHCP_OPTION_ROOT_PATH: {
                 _cleanup_free_ char *p = NULL;
 

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

@@ -7,7 +7,6 @@
 
 #include "alloc-util.h"
 #include "dhcp-server-lease-internal.h"
-#include "dns-domain.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fs-util.h"
@@ -182,8 +181,7 @@ int sd_dhcp_server_set_static_lease(
                 sd_dhcp_server *server,
                 const struct in_addr *address,
                 uint8_t *client_id_raw,
-                size_t client_id_size,
+                size_t client_id_size) {
-                const char *hostname) {
 
         _cleanup_(sd_dhcp_server_lease_unrefp) sd_dhcp_server_lease *lease = NULL;
         sd_dhcp_client_id client_id;
@@ -205,14 +203,6 @@ int sd_dhcp_server_set_static_lease(
                 return 0;
         }
 
-        if (hostname) {
-                r = dns_name_is_valid_ldh(hostname);
-                if (r < 0)
-                        return r;
-                if (r == 0)
-                        return -EINVAL;
-        }
-
         lease = new(sd_dhcp_server_lease, 1);
         if (!lease)
                 return -ENOMEM;
@@ -223,12 +213,6 @@ int sd_dhcp_server_set_static_lease(
                 .client_id = client_id,
         };
 
-        if (hostname) {
-                lease->hostname = strdup(hostname);
-                if (!lease->hostname)
-                        return -ENOMEM;
-        }
-
         r = dhcp_server_put_lease(server, lease, /* is_static = */ true);
         if (r < 0)
                 return r;

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

@@ -534,64 +534,6 @@ static int server_message_init(
         return 0;
 }
 
-static int dhcp_server_append_static_hostname(
-                sd_dhcp_server *server,
-                DHCPPacket *packet,
-                size_t *offset,
-                DHCPRequest *req) {
-
-        sd_dhcp_server_lease *static_lease;
-        int r;
-
-        assert(server);
-        assert(packet);
-        assert(offset);
-        assert(req);
-
-        static_lease = dhcp_server_get_static_lease(server, req);
-        if (!static_lease || !static_lease->hostname)
-                return 0;
-
-        if (dns_name_is_single_label(static_lease->hostname))
-                /* Option 12 */
-                return dhcp_option_append(
-                                &packet->dhcp,
-                                req->max_optlen,
-                                offset,
-                                /* overload= */ 0,
-                                SD_DHCP_OPTION_HOST_NAME,
-                                strlen(static_lease->hostname),
-                                static_lease->hostname);
-
-
-        /* Option 81 */
-        uint8_t buffer[DHCP_MAX_FQDN_LENGTH + 3];
-
-        /* Flags: S=0 (will not update RR), O=1 (are overriding client),
-         * E=1 (using DNS wire format), N=1 (will not update DNS) */
-        buffer[0] = DHCP_FQDN_FLAG_O | DHCP_FQDN_FLAG_E | DHCP_FQDN_FLAG_N;
-
-        /* RFC 4702: A server SHOULD set these to 255 when sending the option and MUST ignore them on
-         * receipt. */
-        buffer[1] = 255;
-        buffer[2] = 255;
-
-        r = dns_name_to_wire_format(static_lease->hostname, buffer + 3, sizeof(buffer) - 3, false);
-        if (r < 0)
-                return log_dhcp_server_errno(server, r, "Failed to encode FQDN for static lease: %m");
-        if (r > DHCP_MAX_FQDN_LENGTH)
-                return log_dhcp_server_errno(server, SYNTHETIC_ERRNO(EINVAL), "FQDN for static lease too long");
-
-        return dhcp_option_append(
-                        &packet->dhcp,
-                        req->max_optlen,
-                        offset,
-                        /* overload= */ 0,
-                        SD_DHCP_OPTION_FQDN,
-                        3 + r,
-                        buffer);
-}
-
 static int server_send_offer_or_ack(
                 sd_dhcp_server *server,
                 DHCPRequest *req,
@@ -733,10 +675,6 @@ static int server_send_offer_or_ack(
                         return r;
         }
 
-        r = dhcp_server_append_static_hostname(server, packet, &offset, req);
-        if (r < 0)
-                return r;
-
         return dhcp_server_send_packet(server, req, packet, type, offset);
 }
 

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

@@ -139,12 +139,8 @@ static void test_message_handler(void) {
 
         ASSERT_OK(sd_dhcp_server_new(&server, 1));
         ASSERT_OK(sd_dhcp_server_configure_pool(server, &address_lo, 8, 0, 0));
-        ASSERT_OK(sd_dhcp_server_set_static_lease(
+        ASSERT_OK(sd_dhcp_server_set_static_lease(server, &static_lease_address, static_lease_client_id,
-                        server,
+                                                  ELEMENTSOF(static_lease_client_id)));
-                        &static_lease_address,
-                        static_lease_client_id,
-                        ELEMENTSOF(static_lease_client_id),
-                        /* hostname= */ NULL));
         ASSERT_OK(sd_dhcp_server_attach_event(server, NULL, 0));
         ASSERT_OK(sd_dhcp_server_start(server));
 
@@ -220,12 +216,8 @@ static void test_message_handler(void) {
 
         /* add the static lease for the client ID */
         ASSERT_OK(sd_dhcp_server_stop(server));
-        ASSERT_OK(sd_dhcp_server_set_static_lease(
+        ASSERT_OK(sd_dhcp_server_set_static_lease(server, &(struct in_addr){ .s_addr = htobe32(INADDR_LOOPBACK + 31) },
-                        server,
+                                                  (uint8_t[7]){ 0x01, 'A', 'B', 'C', 'D', 'E', 'F' }, 7));
-                        &(struct in_addr) { .s_addr = htobe32(INADDR_LOOPBACK + 31) },
-                        (uint8_t[7]) { 0x01, 'A', 'B', 'C', 'D', 'E', 'F' },
-                        7,
-                        /* hostname= */ NULL));
         ASSERT_OK(sd_dhcp_server_start(server));
 
         /* discover */
@@ -252,12 +244,7 @@ static void test_message_handler(void) {
 
         /* drop the static lease for the client ID */
         ASSERT_OK(sd_dhcp_server_stop(server));
-        ASSERT_OK(sd_dhcp_server_set_static_lease(
+        ASSERT_OK(sd_dhcp_server_set_static_lease(server, NULL, (uint8_t[7]){ 0x01, 'A', 'B', 'C', 'D', 'E', 'F' }, 7));
-                        server,
-                        /* address= */ NULL,
-                        (uint8_t[7]) { 0x01, 'A', 'B', 'C', 'D', 'E', 'F' },
-                        7,
-                        /* hostname= */ NULL));
         ASSERT_OK(sd_dhcp_server_start(server));
 
         /* request a new non-static address */
@@ -337,78 +324,35 @@ static void test_static_lease(void) {
 
         ASSERT_OK(sd_dhcp_server_new(&server, 1));
 
-        ASSERT_OK(sd_dhcp_server_set_static_lease(
+        ASSERT_OK(sd_dhcp_server_set_static_lease(server, &(struct in_addr) { .s_addr = 0x01020304 },
-                        server,
+                                                  (uint8_t*) &(uint32_t) { 0x01020304 }, sizeof(uint32_t)));
-                        &(struct in_addr) { .s_addr = 0x01020304 },
-                        (uint8_t *) &(uint32_t) { 0x01020304 },
-                        sizeof(uint32_t),
-                        /* hostname= */ NULL));
         /* Duplicated entry. */
-        ASSERT_ERROR(sd_dhcp_server_set_static_lease(
+        ASSERT_ERROR(sd_dhcp_server_set_static_lease(server, &(struct in_addr) { .s_addr = 0x01020304 },
-                                     server,
+                                                     (uint8_t*) &(uint32_t) { 0x01020304 }, sizeof(uint32_t)), EEXIST);
-                                     &(struct in_addr) { .s_addr = 0x01020304 },
-                                     (uint8_t *) &(uint32_t) { 0x01020304 },
-                                     sizeof(uint32_t),
-                                     /* hostname= */ NULL),
-                     EEXIST);
         /* Address is conflicted. */
-        ASSERT_ERROR(sd_dhcp_server_set_static_lease(
+        ASSERT_ERROR(sd_dhcp_server_set_static_lease(server, &(struct in_addr) { .s_addr = 0x01020304 },
-                                     server,
+                                                     (uint8_t*) &(uint32_t) { 0x01020305 }, sizeof(uint32_t)), EEXIST);
-                                     &(struct in_addr) { .s_addr = 0x01020304 },
-                                     (uint8_t *) &(uint32_t) { 0x01020305 },
-                                     sizeof(uint32_t),
-                                     /* hostname= */ NULL),
-                     EEXIST);
         /* Client ID is conflicted. */
-        ASSERT_ERROR(sd_dhcp_server_set_static_lease(
+        ASSERT_ERROR(sd_dhcp_server_set_static_lease(server, &(struct in_addr) { .s_addr = 0x01020305 },
-                                     server,
+                                                     (uint8_t*) &(uint32_t) { 0x01020304 }, sizeof(uint32_t)), EEXIST);
-                                     &(struct in_addr) { .s_addr = 0x01020305 },
-                                     (uint8_t *) &(uint32_t) { 0x01020304 },
-                                     sizeof(uint32_t),
-                                     /* hostname= */ NULL),
-                     EEXIST);
 
-        ASSERT_OK(sd_dhcp_server_set_static_lease(
+        ASSERT_OK(sd_dhcp_server_set_static_lease(server, &(struct in_addr) { .s_addr = 0x01020305 },
-                        server,
+                                                  (uint8_t*) &(uint32_t) { 0x01020305 }, sizeof(uint32_t)));
-                        &(struct in_addr) { .s_addr = 0x01020305 },
-                        (uint8_t *) &(uint32_t) { 0x01020305 },
-                        sizeof(uint32_t),
-                        /* hostname= */ NULL));
         /* Remove the previous entry. */
-        ASSERT_OK(sd_dhcp_server_set_static_lease(
+        ASSERT_OK(sd_dhcp_server_set_static_lease(server, &(struct in_addr) { .s_addr = 0x00000000 },
-                        server,
+                                                  (uint8_t*) &(uint32_t) { 0x01020305 }, sizeof(uint32_t)));
-                        &(struct in_addr) { .s_addr = 0x00000000 },
-                        (uint8_t *) &(uint32_t) { 0x01020305 },
-                        sizeof(uint32_t),
-                        /* hostname= */ NULL));
         /* Then, set a different address. */
-        ASSERT_OK(sd_dhcp_server_set_static_lease(
+        ASSERT_OK(sd_dhcp_server_set_static_lease(server, &(struct in_addr) { .s_addr = 0x01020306 },
-                        server,
+                                                  (uint8_t*) &(uint32_t) { 0x01020305 }, sizeof(uint32_t)));
-                        &(struct in_addr) { .s_addr = 0x01020306 },
-                        (uint8_t *) &(uint32_t) { 0x01020305 },
-                        sizeof(uint32_t),
-                        /* hostname= */ NULL));
         /* Remove again. */
-        ASSERT_OK(sd_dhcp_server_set_static_lease(
+        ASSERT_OK(sd_dhcp_server_set_static_lease(server, &(struct in_addr) { .s_addr = 0x00000000 },
-                        server,
+                                                  (uint8_t*) &(uint32_t) { 0x01020305 }, sizeof(uint32_t)));
-                        &(struct in_addr) { .s_addr = 0x00000000 },
-                        (uint8_t *) &(uint32_t) { 0x01020305 },
-                        sizeof(uint32_t),
-                        /* hostname= */ NULL));
         /* Try to remove non-existent entry. */
-        ASSERT_OK(sd_dhcp_server_set_static_lease(
+        ASSERT_OK(sd_dhcp_server_set_static_lease(server, &(struct in_addr) { .s_addr = 0x00000000 },
-                        server,
+                                                  (uint8_t*) &(uint32_t) { 0x01020305 }, sizeof(uint32_t)));
-                        &(struct in_addr) { .s_addr = 0x00000000 },
-                        (uint8_t *) &(uint32_t) { 0x01020305 },
-                        sizeof(uint32_t),
-                        /* hostname= */ NULL));
         /* Try to remove non-existent entry. */
-        ASSERT_OK(sd_dhcp_server_set_static_lease(
+        ASSERT_OK(sd_dhcp_server_set_static_lease(server, &(struct in_addr) { .s_addr = 0x00000000 },
-                        server,
+                                                  (uint8_t*) &(uint32_t) { 0x01020306 }, sizeof(uint32_t)));
-                        &(struct in_addr) { .s_addr = 0x00000000 },
-                        (uint8_t *) &(uint32_t) { 0x01020306 },
-                        sizeof(uint32_t),
-                        /* hostname= */ NULL));
 }
 
 static void test_domain_name(void) {

src/network/networkd-dhcp-server-static-lease.c

@@ -2,7 +2,6 @@
 
 #include "alloc-util.h"
 #include "conf-parser.h"
-#include "dns-domain.h"
 #include "ether-addr-util.h"
 #include "hashmap.h"
 #include "networkd-dhcp-server-static-lease.h"
@@ -18,7 +17,6 @@ static DHCPStaticLease* dhcp_static_lease_free(DHCPStaticLease *static_lease) {
 
         config_section_free(static_lease->section);
         free(static_lease->client_id);
-        free(static_lease->hostname);
         return mfree(static_lease);
 }
 
@@ -217,55 +215,3 @@ int config_parse_dhcp_static_lease_hwaddr(
         TAKE_PTR(lease);
         return 0;
 }
-
-int config_parse_dhcp_static_lease_hostname(
-                const char *unit,
-                const char *filename,
-                unsigned line,
-                const char *section,
-                unsigned section_line,
-                const char *lvalue,
-                int ltype,
-                const char *rvalue,
-                void *data,
-                void *userdata) {
-
-        _cleanup_(dhcp_static_lease_free_or_set_invalidp) DHCPStaticLease *lease = NULL;
-        Network *network = ASSERT_PTR(userdata);
-        int r;
-
-        assert(filename);
-        assert(lvalue);
-        assert(rvalue);
-
-        r = lease_new_static(network, filename, section_line, &lease);
-        if (r < 0)
-                return log_oom();
-
-        if (isempty(rvalue)) {
-                lease->hostname = mfree(lease->hostname);
-                TAKE_PTR(lease);
-                return 0;
-        }
-
-        r = dns_name_is_valid_ldh(rvalue);
-        if (r < 0)
-                return log_syntax_parse_error(unit, filename, line, r, lvalue, rvalue);
-        if (r == 0) {
-                log_syntax(unit,
-                           LOG_WARNING,
-                           filename,
-                           line,
-                           0,
-                           "Invalid hostname for DHCPv4 static lease, ignoring assignment: %s",
-                           rvalue);
-                return 0;
-        }
-
-        r = free_and_strdup(&lease->hostname, rvalue);
-        if (r < 0)
-                return log_oom();
-
-        TAKE_PTR(lease);
-        return 0;
-}

src/network/networkd-dhcp-server-static-lease.h

@@ -13,11 +13,9 @@ typedef struct DHCPStaticLease {
         struct in_addr address;
         uint8_t *client_id;
         size_t client_id_size;
-        char *hostname;
 } DHCPStaticLease;
 
 void network_drop_invalid_static_leases(Network *network);
 
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_static_lease_address);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_static_lease_hwaddr);
-CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_static_lease_hostname);

src/network/networkd-dhcp-server.c

@@ -733,12 +733,7 @@ static int dhcp4_server_configure(Link *link) {
         }
 
         HASHMAP_FOREACH(static_lease, link->network->dhcp_static_leases_by_section) {
-                r = sd_dhcp_server_set_static_lease(
+                r = sd_dhcp_server_set_static_lease(link->dhcp_server, &static_lease->address, static_lease->client_id, static_lease->client_id_size);
-                                link->dhcp_server,
-                                &static_lease->address,
-                                static_lease->client_id,
-                                static_lease->client_id_size,
-                                static_lease->hostname);
                 if (r < 0)
                         return log_link_error_errno(link, r, "Failed to set DHCPv4 static lease for DHCP server: %m");
         }

src/network/networkd-json.c

@@ -1300,7 +1300,6 @@ static int dhcp6_client_append_json(Link *link, sd_json_variant **v) {
 static int dhcp_client_lease_append_json(Link *link, sd_json_variant **v) {
         _cleanup_(sd_json_variant_unrefp) sd_json_variant *w = NULL;
         usec_t lease_timestamp_usec = USEC_INFINITY, t1 = USEC_INFINITY, t2 = USEC_INFINITY;
-        const char *hostname = NULL;
         int r;
 
         assert(link);
@@ -1321,16 +1320,10 @@ static int dhcp_client_lease_append_json(Link *link, sd_json_variant **v) {
         if (r < 0 && r != -ENODATA)
                 return r;
 
-        r = sd_dhcp_lease_get_hostname(link->dhcp_lease, &hostname);
+        r = sd_json_buildo(&w,
-        if (r < 0 && r != -ENODATA)
-                return r;
-
-        r = sd_json_buildo(
-                        &w,
                            JSON_BUILD_PAIR_FINITE_USEC("LeaseTimestampUSec", lease_timestamp_usec),
                            JSON_BUILD_PAIR_FINITE_USEC("Timeout1USec", t1),
-                        JSON_BUILD_PAIR_FINITE_USEC("Timeout2USec", t2),
+                           JSON_BUILD_PAIR_FINITE_USEC("Timeout2USec", t2));
-                        JSON_BUILD_PAIR_STRING_NON_EMPTY("Hostname", hostname));
         if (r < 0)
                 return r;
 

src/network/networkd-network-gperf.gperf

@@ -395,7 +395,6 @@ DHCPServer.RapidCommit,                          config_parse_bool,
 DHCPServer.PersistLeases,                        config_parse_dhcp_server_persist_leases,        0,                                      offsetof(Network, dhcp_server_persist_leases)
 DHCPServerStaticLease.Address,                   config_parse_dhcp_static_lease_address,         0,                                      0
 DHCPServerStaticLease.MACAddress,                config_parse_dhcp_static_lease_hwaddr,          0,                                      0
-DHCPServerStaticLease.Hostname,                  config_parse_dhcp_static_lease_hostname,        0,                                      0
 Bridge.Cost,                                     config_parse_uint32,                            0,                                      offsetof(Network, cost)
 Bridge.UseBPDU,                                  config_parse_tristate,                          0,                                      offsetof(Network, use_bpdu)
 Bridge.HairPin,                                  config_parse_tristate,                          0,                                      offsetof(Network, hairpin)

src/run/run.c

@@ -866,10 +866,6 @@ static int parse_argv(int argc, char *argv[]) {
                                                "--wait may not be combined with --scope.");
         }
 
-        if (arg_scope && arg_root_directory)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "--root-directory= is not supported in --scope mode.");
-
         if (same_dir && arg_root_directory && !path_equal(arg_root_directory, "/"))
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "--same-dir cannot be used with a root directory other than '/'");

src/shared/varlink-io.systemd.Network.c

@@ -351,9 +351,7 @@ static SD_VARLINK_DEFINE_STRUCT_TYPE(
                 SD_VARLINK_FIELD_COMMENT("T1 timeout (lease renewal time) in microseconds"),
                 SD_VARLINK_DEFINE_FIELD(Timeout1USec, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("T2 timeout (lease rebinding time) in microseconds"),
-                SD_VARLINK_DEFINE_FIELD(Timeout2USec, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
+                SD_VARLINK_DEFINE_FIELD(Timeout2USec, SD_VARLINK_INT, SD_VARLINK_NULLABLE));
-                SD_VARLINK_FIELD_COMMENT("Hostname received from DHCP server"),
-                SD_VARLINK_DEFINE_FIELD(Hostname, SD_VARLINK_STRING, SD_VARLINK_NULLABLE));
 
 static SD_VARLINK_DEFINE_STRUCT_TYPE(
                 PrivateOption,

src/stdio-bridge/stdio-bridge.c

@@ -114,6 +114,8 @@ static int bus_set_address(
                 const char *bus_path,
                 RuntimeScope runtime_scope) {
 
+        int r;
+
         assert(bus);
 
         switch (transport) {
@@ -141,6 +143,8 @@ static int bus_set_address(
         default:
                 assert_not_reached();
         }
+
+        return r;
 }
 
 static int run(int argc, char *argv[]) {

src/systemd/sd-dhcp-server.h

@@ -79,12 +79,7 @@ int sd_dhcp_server_set_smtp(sd_dhcp_server *server, const struct in_addr smtp[],
 
 int sd_dhcp_server_add_option(sd_dhcp_server *server, sd_dhcp_option *v);
 int sd_dhcp_server_add_vendor_option(sd_dhcp_server *server, sd_dhcp_option *v);
-int sd_dhcp_server_set_static_lease(
+int sd_dhcp_server_set_static_lease(sd_dhcp_server *server, const struct in_addr *address, uint8_t *client_id, size_t client_id_size);
-                sd_dhcp_server *server,
-                const struct in_addr *address,
-                uint8_t *client_id,
-                size_t client_id_size,
-                const char *hostname);
 int sd_dhcp_server_set_lease_file(sd_dhcp_server *server, int dir_fd, const char *path);
 
 int sd_dhcp_server_set_max_lease_time(sd_dhcp_server *server, uint64_t t);

src/test/test-condition.c

@@ -669,14 +669,12 @@ TEST(condition_test_version) {
         condition_free(condition);
 
         /* Test glibc version */
-        bool has = !isempty(gnu_get_libc_version());
-
         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc > 1", false, false)));
-        ASSERT_OK_EQ(condition_test(condition, environ), has);
+        ASSERT_OK_POSITIVE(condition_test(condition, environ));
         condition_free(condition);
 
         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc < 2", false, false)));
-        ASSERT_OK_EQ(condition_test(condition, environ), !has);
+        ASSERT_OK_ZERO(condition_test(condition, environ));
         condition_free(condition);
 
         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc < 9999", false, false)));
@@ -688,27 +686,15 @@ TEST(condition_test_version) {
         condition_free(condition);
 
         v = strjoina("glibc = ", gnu_get_libc_version());
+
         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, v, false, false)));
-        if (has)
         ASSERT_OK_POSITIVE(condition_test(condition, environ));
-        else
-                ASSERT_ERROR(condition_test(condition, environ), EINVAL);
         condition_free(condition);
 
         v = strjoina("glibc != ", gnu_get_libc_version());
+
         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, v, false, false)));
-        if (has)
         ASSERT_OK_ZERO(condition_test(condition, environ));
-        else
-                ASSERT_ERROR(condition_test(condition, environ), EINVAL);
-        condition_free(condition);
-
-        ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc $= ?*", false, false)));
-        ASSERT_OK_EQ(condition_test(condition, environ), has);
-        condition_free(condition);
-
-        ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc !$= ?*", false, false)));
-        ASSERT_OK_EQ(condition_test(condition, environ), !has);
         condition_free(condition);
 }
 

test/fuzz/fuzz-network-parser/dhcp-server-static-lease

@@ -16,12 +16,10 @@ DNS=9.9.9.9
 [DHCPServerStaticLease]
 MACAddress=12:34:56:78:9a:bc
 Address=10.1.1.2
-Hostname=testhost
 
 [DHCPServerStaticLease]
 MACAddress=12:34:56:78:9a:bc
 Address=10.1.1.3
-Hostname=device.example.com
 
 [DHCPServerStaticLease]
 Address=10.1.1.4

test/test-network/conf/25-dhcp-client-fqdn-hostname.network

@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Match]
-Name=veth99
-
-[Network]
-DHCP=ipv4
-IPv6AcceptRA=no
-
-[Link]
-# This MAC overrides the default to match the second static lease
-MACAddress=92:12:01:87:11:19

test/test-network/conf/25-dhcp-client-simple-hostname.network

@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Match]
-Name=veth99
-
-[Network]
-DHCP=ipv4
-IPv6AcceptRA=no

test/test-network/conf/25-dhcp-server-static-hostname.network

@@ -1,27 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Match]
-Name=veth-peer
-
-[Network]
-Address=10.1.1.1/24
-DHCPServer=yes
-IPv6AcceptRA=no
-
-[DHCPServer]
-PoolOffset=100
-PoolSize=50
-DefaultLeaseTimeSec=60
-
-# Scenario 1: Option 12
-# Matches veth99's default MAC (from 25-veth.netdev)
-[DHCPServerStaticLease]
-MACAddress=12:34:56:78:9a:bc
-Address=10.1.1.200
-Hostname=simple-host
-
-# Scenario 2: Option 81
-# Matches the MAC set by 25-dhcp-client-fqdn-hostname.network
-[DHCPServerStaticLease]
-MACAddress=92:12:01:87:11:19
-Address=10.1.1.201
-Hostname=fqdn.example.com

test/test-network/systemd-networkd-tests.py

@@ -7340,32 +7340,6 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities):
         self.assertIn('Address: 10.1.1.200 (DHCPv4 via 10.1.1.1)', output)
         self.assertRegex(output, 'DHCPv4 Client ID: IAID:[0-9a-z]*/DUID')
 
-    def test_dhcp_server_static_lease_hostname_simple(self):
-        copy_network_unit('25-veth.netdev',
-                          '25-dhcp-client-simple-hostname.network',
-                          '25-dhcp-server-static-hostname.network')
-        start_networkd()
-        self.wait_online('veth99:routable', 'veth-peer:routable')
-
-        output = networkctl_json('veth99')
-        check_json(output)
-        print(output)
-        data = json.loads(output)
-        self.assertEqual(data['DHCPv4Client']['Lease']['Hostname'], 'simple-host')
-
-    def test_dhcp_server_static_lease_hostname_fqdn(self):
-        copy_network_unit('25-veth.netdev',
-                          '25-dhcp-client-fqdn-hostname.network',
-                          '25-dhcp-server-static-hostname.network')
-        start_networkd()
-        self.wait_online('veth99:routable', 'veth-peer:routable')
-
-        output = networkctl_json('veth99')
-        check_json(output)
-        print(output)
-        data = json.loads(output)
-        self.assertEqual(data['DHCPv4Client']['Lease']['Hostname'], 'fqdn.example.com')
-
 class NetworkdDHCPServerRelayAgentTests(unittest.TestCase, Utilities):
 
     def setUp(self):