From: David Vossel <dvossel@digium.com>
Date: Fri, 9 Oct 2009 16:03:53 +0000 (+0000)
Subject: Merged revisions 223088 via svnmerge from
X-Git-Tag: 1.6.0.18-rc1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a52d30e5608879040b26d790110071e377b71b18;p=thirdparty%2Fasterisk.git

Merged revisions 223088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r223088 | dvossel | 2009-10-09 10:49:30 -0500 (Fri, 09 Oct 2009) | 14 lines

  p->peerauth is always empty in transmit_register()

  When using callbackextension or specifing the peer name
  in a registration string, the peer's specific auth settings
  set by the "auth=" strings within the peer definition are not
  used by the registration.  Thanks to ebroad for reporting the
  issue and providing the patch.

  (closes issue #15955)
  Reported by: ebroad
  Patches:
        regauthfix.patch uploaded by ebroad (license 878)
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a5222e489a..740bdd07f4 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9965,6 +9965,8 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char *
 		if (!ast_strlen_zero(r->peername)) {
 			if (!(peer = find_peer(r->peername, NULL, 1, 0, 0))) {
 				ast_log(LOG_WARNING, "Could not find peer %s in transmit_register\n", r->peername);
+			} else {
+				p->peerauth = peer->auth;
 			}
 		}
 		obproxy_get(p, peer); /* it is ok to pass a NULL peer into obproxy_get() */