From: Joshua Colp <jcolp@digium.com>
Date: Fri, 20 Jul 2007 17:21:23 +0000 (+0000)
Subject: Merged revisions 76087 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1994
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=989b93143a3dc090e7040a460307ed9c940183e6;p=thirdparty%2Fasterisk.git

Merged revisions 76087 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r76087 | file | 2007-07-20 14:20:09 -0300 (Fri, 20 Jul 2007) | 14 lines

Merged revisions 76080 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r76080 | file | 2007-07-20 14:16:48 -0300 (Fri, 20 Jul 2007) | 6 lines

(closes issue #10247)
Reported by: fkasumovic
Patches:
      chan_sip.patch uploaded by fkasumovic (license #101)
Drop any peer realm authentication entries when reloading so multiple entries do not get added to the peer.

........

................


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5214973b57..c90a008029 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16971,6 +16971,11 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
 		peer->chanvars = NULL;
 		/* XXX should unregister ? */
 	}
+
+	/* If we have realm authentication information, remove them (reload) */
+	clear_realm_authentication(peer->auth);
+	peer->auth = NULL;
+
 	for (; v || ((v = alt) && !(alt=NULL)); v = v->next) {
 		if (handle_common_options(&peerflags[0], &mask[0], v))
 			continue;