summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2014-07-01 16:00:05 +0200
committerKay Sievers <kay@vrfy.org>2014-07-01 16:00:05 +0200
commitf841a154efbb3162d2a732936f031ac7a6b0d4cf (patch)
tree914f57c79f393a34fa7fa4bab808eeb3d3f37ca9
parent3058e017fced6d5c8712e10c8c1477421bc1e960 (diff)
parse_uid: return -ENXIO for -1 uids
-rw-r--r--src/shared/audit.c3
-rw-r--r--src/shared/util.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/shared/audit.c b/src/shared/audit.c
index 5466447737..f101050825 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 e75f6c9df3..9b5a47ab6f 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;