external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug #77 - Error in ACL command parsing.

Browse Source
This commit is contained in:
Jan Vidar Krey 2009-08-31 19:39:09 +02:00
parent aeba7188c0
commit 1e380ecf0f
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/auth.c
View File

@ -179,26 +179,18 @@ static int acl_parse_line(char* line, int line_count, void* ptr_data)
char* pos; char* pos;
struct acl_handle* handle = (struct acl_handle*) ptr_data; struct acl_handle* handle = (struct acl_handle*) ptr_data;
int ret; int ret;
if ((pos = strchr(line, '#')) != NULL) if ((pos = strchr(line, '#')) != NULL)
{ {
pos[0] = 0; pos[0] = 0;
} }
line = strip_white_space(line);
if (!*line) if (!*line)
return 0; return 0;
LOG_DEBUG("acl_parse_line(): '%s'", line);
line = strip_white_space(line);
if (!*line)
{
LOG_FATAL("ACL parse error on line %d", line_count);
return -1;
}
LOG_DEBUG("acl_parse_line: '%s'", line); LOG_DEBUG("acl_parse_line: '%s'", line);
ACL_ADD_USER("bot", handle->users, cred_bot); ACL_ADD_USER("bot", handle->users, cred_bot);
ACL_ADD_USER("user_admin", handle->users, cred_admin); ACL_ADD_USER("user_admin", handle->users, cred_admin);
ACL_ADD_USER("user_super", handle->users, cred_super); ACL_ADD_USER("user_super", handle->users, cred_super);
@ -210,7 +202,7 @@ static int acl_parse_line(char* line, int line_count, void* ptr_data)
ACL_ADD_BOOL("ban_cid", handle->cids); ACL_ADD_BOOL("ban_cid", handle->cids);
ACL_ADD_ADDR("deny_ip", handle->networks); ACL_ADD_ADDR("deny_ip", handle->networks);
ACL_ADD_ADDR("nat_ip", handle->nat_override); ACL_ADD_ADDR("nat_ip", handle->nat_override);
LOG_ERROR("Unknown ACL command on line %d: '%s'", line_count, line); LOG_ERROR("Unknown ACL command on line %d: '%s'", line_count, line);
return -1; return -1;
} }

11
src/util/misc.c
View File

@ -45,12 +45,15 @@ static int is_printable(unsigned char c)
char* strip_white_space(char* string) char* strip_white_space(char* string)
{ {
char* pos; char* pos;
if (!string)
return "";
while (string[0] && is_white_space(string[0])) string++; while (string[0] && is_white_space(string[0])) string++;
if (!*string) if (!*string)
return 0; return string;
/* Strip appending whitespace */ /* Strip appending whitespace */
pos = &string[strlen(string)-1]; pos = &string[strlen(string)-1];
while (&string[0] < &pos[0] && is_white_space(pos[0])) { pos[0] = 0; pos--; } while (&string[0] < &pos[0] && is_white_space(pos[0])) { pos[0] = 0; pos--; }