d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inetd: prefer strtonum(3) to strspn(3)+atoi(3), NFC

Browse Source 
strtonum(3) does effectively the same validation as we had, but it's more
concise.
This commit is contained in:
Kyle Evans 2019-12-31 04:36:14 +00:00
parent 8acd3f126a
commit 1c3b9acf2e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/inetd/builtins.c
View File

@ -649,8 +649,14 @@ ident_stream(int s, struct servtab *sep)
goto fakeid_fail;
if (!Fflag) {
if (iflag) {
if (p[strspn(p, "0123456789")] == '\0' &&
getpwuid(atoi(p)) != NULL)
const char *errstr;
uid_t uid;
uid = strtonum(p, 0, UID_MAX, &errstr);
if (errstr != NULL)
goto fakeid_fail;
if (getpwuid(uid) != NULL)
goto fakeid_fail;
} else {
if (getpwnam(p) != NULL)