chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
3058e01
)
parse_uid: return -ENXIO for -1 uids
author
Kay Sievers
<kay@vrfy.org>
Tue, 1 Jul 2014 14:00:05 +0000
(16:00 +0200)
committer
Kay Sievers
<kay@vrfy.org>
Tue, 1 Jul 2014 14:00:05 +0000
(16:00 +0200)
src/shared/audit.c
patch
|
blob
|
history
src/shared/util.c
patch
|
blob
|
history
diff --git
a/src/shared/audit.c
b/src/shared/audit.c
index 546644773720934a18412394fb7d3687567eed3e..f101050825384ff43e5b8e1f711dfc6c93f21e09 100644
(file)
--- 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 e75f6c9df33c7f8439f3172e47a7dcf7bcebe9eb..9b5a47ab6fb6d3735937945c156d7a526171adfe 100644
(file)
--- 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 -E
INVAL
;
+ return -E
NXIO
;
/* A long time ago UIDs where 16bit, hence explicitly avoid the 16bit -1 too */
if (uid == (uid_t) 0xFFFF)
- return -E
INVAL
;
+ return -E
NXIO
;
*ret_uid = uid;
return 0;