aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-10-09 16:03:53 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-10-09 16:03:53 +0000
commit08475d82d579b56924e7669ed14e941965bead1a (patch)
tree203c201967b9c8ebfba6ca6f8c03be5e7f80c28b /channels
parent5477b9bfa32e0551a72576c4c75a453d64dd1204 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@223091 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a5222e489..740bdd07f 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() */