allow '_' chars in usernames provided to libfko

This commit is contained in:
Michael Rash 2012-11-08 21:02:44 -05:00
parent 36630694fd
commit 2ae1449122
2 changed files with 5 additions and 2 deletions

View File

@ -130,13 +130,14 @@ validate_username(const char *username)
if(username == NULL || strnlen(username, MAX_SPA_USERNAME_SIZE) == 0)
return(FKO_ERROR_INVALID_DATA);
/* Make sure it is just alpha-numeric chars and dashes
/* Make sure it is just alpha-numeric chars, dashes, and underscores
*/
if(isalnum(username[0]) == 0)
return(FKO_ERROR_INVALID_DATA);
for (i=1; i < strnlen(username, MAX_SPA_USERNAME_SIZE); i++)
if((isalnum(username[i]) == 0) && username[i] != '-')
if((isalnum(username[i]) == 0)
&& username[i] != '-' && username[i] != '_')
return(FKO_ERROR_INVALID_DATA);
return FKO_SUCCESS;

View File

@ -3270,6 +3270,7 @@ sub valid_usernames() {
'root',
'mbr',
'test-test',
'test_test',
'someuser',
'someUser',
'USER',
@ -3289,6 +3290,7 @@ sub fuzzing_usernames() {
'123.123',
'123$123',
'-user',
'_user',
'-User',
',User',
'part1 part2',