diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/acl.c | 2 | ||||
| -rw-r--r-- | main/manager.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/main/acl.c b/main/acl.c index 92b675443..d133b2a07 100644 --- a/main/acl.c +++ b/main/acl.c @@ -479,7 +479,7 @@ void ast_append_acl(const char *sense, const char *stuff, struct ast_acl_list ** AST_LIST_TRAVERSE(working_list, current, list) { if (!strcasecmp(current->name, tmp)) { /* ACL= */ /* Inclusion of the same ACL multiple times isn't a catastrophic error, but it will raise the error flag and skip the entry. */ - ast_log(LOG_ERROR, "Named ACL '%s' is already included in the ast_acl container.", tmp); + ast_log(LOG_ERROR, "Named ACL '%s' occurs multiple times in ACL definition. Please update your ACL configuration.", tmp); if (error) { *error = 1; } diff --git a/main/manager.c b/main/manager.c index 2ff9df930..846f6e604 100644 --- a/main/manager.c +++ b/main/manager.c @@ -8977,7 +8977,13 @@ static int __init_manager(int reload, int by_external_config) } else if (!strcasecmp(var->name, "deny") || !strcasecmp(var->name, "permit") || !strcasecmp(var->name, "acl")) { - ast_append_acl(var->name, var->value, &user->acl, NULL, &acl_subscription_flag); + int acl_error = 0; + + ast_append_acl(var->name, var->value, &user->acl, &acl_error, &acl_subscription_flag); + if (acl_error) { + ast_log(LOG_ERROR, "Invalid ACL '%s' for manager user '%s' on line %d. Deleting user\n"); + user->keep = 0; + } } else if (!strcasecmp(var->name, "read") ) { user->readperm = get_perm(var->value); } else if (!strcasecmp(var->name, "write") ) { |