From: Kay Sievers <kay@vrfy.org>
Date: Tue, 1 Jul 2014 14:00:05 +0000 (+0200)
Subject: parse_uid: return -ENXIO for -1 uids
X-Git-Tag: v215~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f841a154efbb3162d2a732936f031ac7a6b0d4cf;p=thirdparty%2Fsystemd.git

parse_uid: return -ENXIO for -1 uids
---

diff --git a/src/shared/audit.c b/src/shared/audit.c
index 54664477372..f1010508253 100644
--- a/src/shared/audit.c
+++ b/src/shared/audit.c
@@ -77,9 +77,6 @@ int audit_loginuid_from_pid(pid_t pid, uid_t *uid) {
         if (r < 0)
                 return r;
 
-        if (u == (uid_t) -1)
-                return -ENXIO;
-
         *uid = (uid_t) u;
         return 0;
 }
diff --git a/src/shared/util.c b/src/shared/util.c
index e75f6c9df33..9b5a47ab6fb 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -282,11 +282,11 @@ int parse_uid(const char *s, uid_t* ret_uid) {
 
         /* Some libc APIs use (uid_t) -1 as special placeholder */
         if (uid == (uid_t) 0xFFFFFFFF)
-                return -EINVAL;
+                return -ENXIO;
 
         /* A long time ago UIDs where 16bit, hence explicitly avoid the 16bit -1 too */
         if (uid == (uid_t) 0xFFFF)
-                return -EINVAL;
+                return -ENXIO;
 
         *ret_uid = uid;
         return 0;