From 22e299fc5e4380fffa2823a6061d7360ce9031ab Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 9 May 2023 00:27:22 +0900 Subject: sd-dhcp-client: drop redundant condition Closes #27561. --- src/libsystemd-network/sd-dhcp-client.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/libsystemd-network') diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index f207cf0c1e..b73abcb82d 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -828,14 +828,12 @@ static int client_message_init( /* Some DHCP servers will refuse to issue an DHCP lease if the Client Identifier option is not set */ - if (client->client_id_len) { - r = dhcp_option_append(&packet->dhcp, optlen, &optoffset, 0, - SD_DHCP_OPTION_CLIENT_IDENTIFIER, - client->client_id_len, - &client->client_id); - if (r < 0) - return r; - } + r = dhcp_option_append(&packet->dhcp, optlen, &optoffset, 0, + SD_DHCP_OPTION_CLIENT_IDENTIFIER, + client->client_id_len, + &client->client_id); + if (r < 0) + return r; /* RFC2131 section 3.5: in its initial DHCPDISCOVER or DHCPREQUEST message, a -- cgit v1.2.1