shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-11 20:58:27 +03:00
Code

network: don't warn with no NSID assigned

Browse Source 
This is nothing interesting to warn about. Also use the symbolic
constant name when testing for this condition.

(cherry picked from commit e803e95760be87588533f9affd76db6ad0b5fac8)
(cherry picked from commit 0cddbebfbeedd3f71037d988dc91b6fb9f9b281f)
This commit is contained in:
Ronan Pigott 2024-12-14 14:39:26 -07:00 committed by Luca Boccassi
parent 9678a5a1b3
commit 86197c1308
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/networkd-manager-bus.c
View File

@ -304,7 +304,7 @@ static int property_get_namespace_nsid(
* number. */
r = netns_get_nsid(/* netnsfd= */ -EBADF, &nsid);
if (r < 0)
if (r < 0 && r != -ENODATA)
log_warning_errno(r, "Failed to query network nsid, ignoring: %m");
return sd_bus_message_append(reply, "u", nsid);

2
src/shared/socket-netlink.c
View File

@ -466,7 +466,7 @@ int netns_get_nsid(int netnsfd, uint32_t *ret) {
if (r < 0)
return r;
if (u == UINT32_MAX) /* no NSID assigned yet */
if (u == (uint32_t) NETNSA_NSID_NOT_ASSIGNED) /* no NSID assigned yet */
return -ENODATA;
if (ret)