Merged revisions 308679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r308679 | twilson | 2011-02-23 21:41:34 -0600 (Wed, 23 Feb 2011) | 15 lines Merged revisions 308678 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r308678 | twilson | 2011-02-23 21:38:22 -0600 (Wed, 23 Feb 2011) | 8 lines Use remotesecret to authenticate with a remote party The remotesecret option was only being used for outbound registration and not for placing calls. This patch uses remotesecret on outbound calls if it is set, otherwise secret is still used. Review: https://reviewboard.asterisk.org/r/1107/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@308680 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
499c3f24d9
commit
f64a32ec78
|
@ -18529,7 +18529,9 @@ static int build_reply_digest(struct sip_pvt *p, int method, char* digest, int d
|
|||
} else {
|
||||
/* No authentication, use peer or register= config */
|
||||
username = p->authname;
|
||||
secret = p->peersecret;
|
||||
secret = p->relatedpeer
|
||||
&& !ast_strlen_zero(p->relatedpeer->remotesecret)
|
||||
? p->relatedpeer->remotesecret : p->peersecret;
|
||||
md5secret = p->peermd5secret;
|
||||
}
|
||||
if (ast_strlen_zero(username)) /* We have no authentication */
|
||||
|
|
|
@ -1014,6 +1014,10 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
|
|||
; Asterisk only matches on IP/port, not on names. This is mostly used for SIP
|
||||
; trunks.
|
||||
;
|
||||
; Use remotesecret for outbound authentication, and secret for authenticating
|
||||
; inbound requests. For historical reasons, if no remotesecret is supplied for an
|
||||
; outbound registration or call, the secret will be used.
|
||||
;
|
||||
; For device names, we recommend using only a-z, numerics (0-9) and underscore
|
||||
;
|
||||
; For local phones, type=friend works most of the time
|
||||
|
|
Reference in New Issue