woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user: correct check for getpwnam/gegrpnam failures

Browse Source
This commit is contained in:
Robert Swiecki 2017-12-02 02:53:32 +01:00
parent dd0b51eded
commit e8e2f4b011
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
user.c
View File

@ -327,7 +327,7 @@ static uid_t cmdParseUid(const char* id) {
if (utilIsANumber(id)) { if (utilIsANumber(id)) {
return (uid_t)strtoull(id, NULL, 0); return (uid_t)strtoull(id, NULL, 0);
} }
return -1; return (uid_t)-1;
} }
static gid_t cmdParseGid(const char* id) { static gid_t cmdParseGid(const char* id) {
@ -341,7 +341,7 @@ static gid_t cmdParseGid(const char* id) {
if (utilIsANumber(id)) { if (utilIsANumber(id)) {
return (gid_t)strtoull(id, NULL, 0); return (gid_t)strtoull(id, NULL, 0);
} }
return -1; return (gid_t)-1;
} }
bool userParseId(struct nsjconf_t* nsjconf, const char* i_id, const char* o_id, size_t cnt, bool userParseId(struct nsjconf_t* nsjconf, const char* i_id, const char* o_id, size_t cnt,
@ -356,7 +356,7 @@ bool userParseId(struct nsjconf_t* nsjconf, const char* i_id, const char* o_id,
return false; return false;
} }
outside_id = cmdParseGid(o_id); outside_id = cmdParseGid(o_id);
if (inside_id == (uid_t)-1) { if (outside_id == (uid_t)-1) {
LOG_W("Cannot parse '%s' as GID", o_id); LOG_W("Cannot parse '%s' as GID", o_id);
return false; return false;
} }
@ -367,7 +367,7 @@ bool userParseId(struct nsjconf_t* nsjconf, const char* i_id, const char* o_id,
return false; return false;
} }
outside_id = cmdParseUid(o_id); outside_id = cmdParseUid(o_id);
if (inside_id == (uid_t)-1) { if (outside_id == (uid_t)-1) {
LOG_W("Cannot parse '%s' as UID", o_id); LOG_W("Cannot parse '%s' as UID", o_id);
return false; return false;
} }