[asterisk-commits] dvossel: trunk r284953 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Sep  3 13:04:10 2010
New Revision: 284953

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=284953&r1=284952&r2=284953
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Sep  3 13:04:10 2010
@@ -20505,7 +20505,6 @@
 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 @@
 		/* 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;