From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 18 Nov 2025 11:41:45 +0000 (+0100)
Subject: networkd: use STRERROR_{USER,GROUP}
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F39783%2Fhead;p=thirdparty%2Fsystemd.git

networkd: use STRERROR_{USER,GROUP}
---

diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c
index 3c573335c0c..12884588190 100644
--- a/src/network/netdev/tuntap.c
+++ b/src/network/netdev/tuntap.c
@@ -239,10 +239,9 @@ static int tuntap_verify(NetDev *netdev, const char *filename) {
                 r = userdb_by_name(t->user_name, &USERDB_MATCH_ROOT_AND_SYSTEM,
                                    USERDB_SUPPRESS_SHADOW | USERDB_PARSE_NUMERIC,
                                    &ur);
-                if (r == -ENOEXEC)
-                        log_netdev_warning_errno(netdev, r, "User %s is not a system user, ignoring.", t->user_name);
-                else if (r < 0)
-                        log_netdev_warning_errno(netdev, r, "Cannot resolve user name %s, ignoring: %m", t->user_name);
+                if (r < 0)
+                        log_netdev_warning_errno(netdev, r, "Cannot resolve user name '%s', ignoring: %s",
+                                                 t->user_name, STRERROR_USER(r));
                 else
                         t->uid = ur->uid;
         }
@@ -253,10 +252,9 @@ static int tuntap_verify(NetDev *netdev, const char *filename) {
                 r = groupdb_by_name(t->group_name, &USERDB_MATCH_ROOT_AND_SYSTEM,
                                     USERDB_SUPPRESS_SHADOW | USERDB_PARSE_NUMERIC,
                                     &gr);
-                if (r == -ENOEXEC)
-                        log_netdev_warning_errno(netdev, r, "Group %s is not a system group, ignoring.", t->group_name);
-                else if (r < 0)
-                        log_netdev_warning_errno(netdev, r, "Cannot resolve group name %s, ignoring: %m", t->group_name);
+                if (r < 0)
+                        log_netdev_warning_errno(netdev, r, "Cannot resolve group name '%s', ignoring: %s",
+                                                 t->group_name, STRERROR_GROUP(r));
                 else
                         t->gid = gr->gid;
         }