diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-03 18:04:10 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-03 18:04:10 +0000 |
| commit | abfcd46eb6b39c24c114ca27000fa80a611d665f (patch) | |
| tree | cc5062290ad447051ac4e8ad5f8fbdcb41de935a /channels | |
| parent | 984a550f3b56279c523083d35fcd68fbad98c107 (diff) | |
Merged revisions 284952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r284952 | dvossel | 2010-09-03 13:03:23 -0500 (Fri, 03 Sep 2010) | 2 lines
During OPTIONS authentication, the authpeer does not need to be returned for any reason.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@284953 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8d0b51971..f4e231245 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -20505,7 +20505,6 @@ static int handle_request_notify(struct sip_pvt *p, struct sip_request *req, str static int handle_request_options(struct sip_pvt *p, struct sip_request *req, struct ast_sockaddr *addr, const char *e) { int res; - struct sip_peer *authpeer = NULL; /* Matching Peer */ if (p->lastinvite) { /* if this is a request in an active dialog, just confirm that the dialog exists. */ @@ -20517,7 +20516,7 @@ static int handle_request_options(struct sip_pvt *p, struct sip_request *req, st /* Do authentication if this OPTIONS request began the dialog */ copy_request(&p->initreq, req); set_pvt_allowed_methods(p, req); - res = check_user_full(p, req, SIP_OPTIONS, e, XMIT_UNRELIABLE, addr, &authpeer); + res = check_user(p, req, SIP_OPTIONS, e, XMIT_UNRELIABLE, addr); if (res == AUTH_CHALLENGE_SENT) { sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT); return 0; |