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

* libmisc/chkname.h, libmisc/chkname.c: check_group_name (resp.

Browse Source 
check_user_name) renamed to is_valid_user_name (resp.
	is_valid_group_name). is_valid_user_name and is_valid_group_name
	return a bool.
	* src/grpck.c, src/newusers.c, src/usermod.c, src/useradd.c,
	src/groupmod.c, src/pwck.c, src/groupadd.c: Use is_valid_user_name
	and is_valid_group_name, following above change.
	* libmisc/chkname.c: Avoid implicit conversion of chars to
	booleans. Add brackets and parenthesis.
This commit is contained in:
nekral-guest
2008-05-25 20:58:16 +00:00
parent cb8d416b37
commit 623d9e2ab3
10 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
libmisc/chkname.c
View File

@@ -31,8 +31,11 @@
*/
/*
* check_user_name(), check_group_name() - check the new user/group
* name for validity; return value: 1 - OK, 0 - bad name
* is_valid_user_name(), is_valid_group_name() - check the new user/group
* name for validity;
* return values:
* true - OK
* false - bad name
*/
#include <config.h>
@@ -47,26 +50,32 @@
#else
#include <utmp.h>
#endif
static int good_name (const char *name)
static bool is_valid_name (const char *name)
{
/*
* User/group names must match [a-z_][a-z0-9_-]*[$]
*/
if (!*name || !((*name >= 'a' && *name <= 'z') || *name == '_'))
return 0;
while (*++name) {
if (!((*name >= 'a' && *name <= 'z') ||
(*name >= '0' && *name <= '9') ||
*name == '_' || *name == '-' ||
(*name == '$' && *(name + 1) == '\0')))
return 0;
if (('\0' == *name) ||
!((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) {
return false;
}
return 1;
while ('\0' != *++name) {
if (!(( ('a' <= *name) && ('z' >= *name) ) ||
( ('0' <= *name) && ('9' >= *name) ) ||
('_' == *name) ||
('-' == *name) ||
( ('$' == *name) && ('\0' == *(name + 1)) )
)) {
return false;
}
}
return true;
}
int check_user_name (const char *name)
bool is_valid_user_name (const char *name)
{
#if HAVE_UTMPX_H
struct utmpx ut;
@@ -78,21 +87,23 @@ int check_user_name (const char *name)
* User names are limited by whatever utmp can
* handle (usually max 8 characters).
*/
if (strlen (name) > sizeof (ut.ut_user))
return 0;
if (strlen (name) > sizeof (ut.ut_user)) {
return false;
}
return good_name (name);
return is_valid_name (name);
}
int check_group_name (const char *name)
bool is_valid_group_name (const char *name)
{
/*
* Arbitrary limit for group names - max 16
* characters (same as on HP-UX 10).
*/
if (strlen (name) > 16)
return 0;
if (strlen (name) > 16) {
return false;
}
return good_name (name);
return is_valid_name (name);
}

11
libmisc/chkname.h
View File

@@ -34,13 +34,16 @@
#define _CHKNAME_H_
/*
* check_user_name(), check_group_name() - check the new user/group
* name for validity; return value: 1 - OK, 0 - bad name
* is_valid_user_name(), is_valid_group_name() - check the new user/group
* name for validity;
* return values:
* true - OK
* false - bad name
*/
#include "defines.h"
extern int check_user_name (const char *);
extern int check_group_name (const char *name);
extern bool is_valid_user_name (const char *name);
extern bool is_valid_group_name (const char *name);
#endif