automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@76101 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 29e7c4972301a7ae79c13c7c1c938db9acca0633..035c29f9e985e69bed4f79608fb45606eeec56c1 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12629,6 +12629,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int
                ast_variables_destroy(peer->chanvars);
                peer->chanvars = NULL;
        }
+       /* If we have realm authentication information, remove them (reload) */
+       clear_realm_authentication(peer->auth);
+       peer->auth = (struct sip_auth *) NULL;
        strcpy(peer->context, default_context);
        strcpy(peer->subscribecontext, default_subscribecontext);
        strcpy(peer->vmexten, global_vmexten);