From: Richard Mudgett Date: Tue, 8 Oct 2013 19:08:12 +0000 (+0000) Subject: app_confbridge: Fix duplicate default_user profile. X-Git-Tag: 11.7.0-rc1~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bc28a1af4f017dfd6a352802c433b2f72c2c900;p=thirdparty%2Fasterisk.git app_confbridge: Fix duplicate default_user profile. * Fixed looking in the wrong profiles container to see if the default_user profile is already created in verify_default_profiles(). The bridge profile container is never going to hold user profiles. :) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@400723 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c index 9244a42e05..e64c856054 100644 --- a/apps/confbridge/conf_config_parser.c +++ b/apps/confbridge/conf_config_parser.c @@ -1306,7 +1306,7 @@ static int verify_default_profiles(void) ao2_link(cfg->bridge_profiles, bridge_profile); } - user_profile = ao2_find(cfg->bridge_profiles, DEFAULT_USER_PROFILE, OBJ_KEY); + user_profile = ao2_find(cfg->user_profiles, DEFAULT_USER_PROFILE, OBJ_KEY); if (!user_profile) { user_profile = user_profile_alloc(DEFAULT_USER_PROFILE); if (!user_profile) {