emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

sub[ug]id: compare range before comparing username/UID, to avoid unnecessary syscalls

Browse Source 
Change suggested by Nicolas François as performance optimization.
Performance penalty would be really noticeable when usernames are
stored in remote databases (ldap).

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Bostjan Skufca
2014-09-06 18:47:55 +00:00
committed by Serge Hallyn
parent 37e2a687e3
commit 1d049b6aed
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/subordinateio.c
View File

@ -245,11 +245,19 @@ static const struct subordinate_range *find_range(struct commonio_db *db,
unsigned long first = range->start; unsigned long first = range->start;
unsigned long last = first + range->count - 1; unsigned long last = first + range->count - 1;
/* For performance reasons check range before using getpwnam() */
if ((val < first) || (val > last)) {
continue;
}
/* /*
* First check if range owner is specified as numeric UID * Range matches. Check if range owner is specified
* and if it matches. * as numeric UID and if it matches.
*/ */
if (0 != strcmp(range->owner, owner_uid_string)) { if (0 == strcmp(range->owner, owner_uid_string)) {
return range;
}
/* /*
* Ok, this range owner is not specified as numeric UID * Ok, this range owner is not specified as numeric UID
* we are looking for. It may be specified as another * we are looking for. It may be specified as another
@ -268,13 +276,7 @@ static const struct subordinate_range *find_range(struct commonio_db *db,
continue; continue;
} }
if (owner_uid != range_owner_pwd->pw_uid) { if (owner_uid == range_owner_pwd->pw_uid) {
continue;
}
}
/* Owner matches, now let us check this UID/GID range */
if ((val >= first) && (val <= last)) {
return range; return range;
} }
} }