From 16eac93882ebb7bdc82cce8bacd10e009dd254d9 Mon Sep 17 00:00:00 2001 From: David Vossel <dvossel@digium.com> Date: Fri, 3 Sep 2010 18:04:10 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@284953 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8d0b51971c..f4e2312458 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; -- GitLab