[asterisk-commits] dvossel: branch 1.6.0 r223091 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Oct  9 11:03:53 2009
New Revision: 223091

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=223091
Log:
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)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=223091&r1=223090&r2=223091
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Fri Oct  9 11:03:53 2009
@@ -9965,6 +9965,8 @@
 		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() */