diff options
author | Balint Reczey <balint@balintreczey.hu> | 2022-11-10 16:24:06 +0100 |
---|---|---|
committer | Balint Reczey <balint@balintreczey.hu> | 2022-11-10 16:24:06 +0100 |
commit | 3987cc788047570ecf10707dfc8958780d85c73c (patch) | |
tree | 109724175f07436696f51b14b5abbd3f4d704d6d /libmisc/chkname.c | |
parent | 8ead740677d19e48690d4f144ab090b83d47059f (diff) | |
download | shadow-3987cc788047570ecf10707dfc8958780d85c73c.tar.gz |
New upstream version 4.13+dfsg1upstream/4.13+dfsg1upstream
Diffstat (limited to 'libmisc/chkname.c')
-rw-r--r-- | libmisc/chkname.c | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/libmisc/chkname.c b/libmisc/chkname.c index cb002a14..e31ee8c9 100644 --- a/libmisc/chkname.c +++ b/libmisc/chkname.c @@ -32,26 +32,44 @@ static bool is_valid_name (const char *name) } /* - * User/group names must match [a-z_][a-z0-9_-]*[$] - */ + * User/group names must match gnu e-regex: + * [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]? + * + * as a non-POSIX, extension, allow "$" as the last char for + * sake of Samba 3.x "add machine script" + * + * Also do not allow fully numeric names or just "." or "..". + */ + int numeric; - if (('\0' == *name) || - !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) { + if ('\0' == *name || + ('.' == *name && (('.' == name[1] && '\0' == name[2]) || + '\0' == name[1])) || + !((*name >= 'a' && *name <= 'z') || + (*name >= 'A' && *name <= 'Z') || + (*name >= '0' && *name <= '9') || + *name == '_' || + *name == '.')) { return false; } + numeric = isdigit(*name); + while ('\0' != *++name) { - if (!(( ('a' <= *name) && ('z' >= *name) ) || - ( ('0' <= *name) && ('9' >= *name) ) || - ('_' == *name) || - ('-' == *name) || - ( ('$' == *name) && ('\0' == *(name + 1)) ) + if (!((*name >= 'a' && *name <= 'z') || + (*name >= 'A' && *name <= 'Z') || + (*name >= '0' && *name <= '9') || + *name == '_' || + *name == '.' || + *name == '-' || + (*name == '$' && name[1] == '\0') )) { return false; } + numeric &= isdigit(*name); } - return true; + return !numeric; } bool is_valid_user_name (const char *name) |