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. :)
........

Merged revisions 400723 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 400724 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400728 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index 470b680..6c57f16 100644 (file)
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -1875,7 +1875,7 @@ static int verify_default_profiles(void)
                ao2_link(cfg->bridge_profiles, bridge_profile);
        }
 
                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) {
        if (!user_profile) {
                user_profile = user_profile_alloc(DEFAULT_USER_PROFILE);
                if (!user_profile) {