diff options
| author | Sean Bright <sean@malleable.com> | 2014-03-25 18:44:57 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2014-03-25 18:44:57 +0000 |
| commit | c32fe8b8e50f9b494bddc2bb63cd2bb1ed02ba57 (patch) | |
| tree | f7780c5200a48b710ac00cfcc6cbd1e99002149d /res | |
| parent | 2bf37a417d7ca529311b56344d56c4a421db3c25 (diff) | |
ARI: Don't complain about missing ARI users when we aren't enabled
Currently, if ARI is not enabled it will still complain that there are no
configured users. This patch checks to see if ARI is enabled before logging and
error or iterating the container to validate the users.
Review: https://reviewboard.asterisk.org/r/3391/
........
Merged revisions 411173 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/ari/config.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/res/ari/config.c b/res/ari/config.c index e25fa8ad1..59c4d7d94 100644 --- a/res/ari/config.c +++ b/res/ari/config.c @@ -290,12 +290,14 @@ static int process_config(int reload) return -1; } - if (ao2_container_count(conf->users) == 0) { - ast_log(LOG_ERROR, "No configured users for ARI\n"); + if (conf->general->enabled) { + if (ao2_container_count(conf->users) == 0) { + ast_log(LOG_ERROR, "No configured users for ARI\n"); + } else { + ao2_callback(conf->users, OBJ_NODATA, validate_user_cb, NULL); + } } - ao2_callback(conf->users, OBJ_NODATA, validate_user_cb, NULL); - return 0; } |