[asterisk-commits] twilson: trunk r301684 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Jan 12 15:24:18 2011
New Revision: 301684

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301684
Log:
Merged revisions 301683 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301683 | twilson | 2011-01-12 15:19:48 -0600 (Wed, 12 Jan 2011) | 15 lines
  
  Merged revisions 301682 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r301682 | twilson | 2011-01-12 15:05:02 -0600 (Wed, 12 Jan 2011) | 9 lines
    
    Don't reject all SUBSCRIBE auth requests
    
    When merging another SUBSCRIBE fix from 1.4, some braces were put in
    the wrong place. This patch fixes that.
    
    (closes issue #18597)
    Reported by: thsgmbh
  ........
................

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=301684&r1=301683&r2=301684
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Jan 12 15:24:18 2011
@@ -23394,10 +23394,10 @@
 				ast_log(LOG_NOTICE, "Failed to authenticate device %s for SUBSCRIBE\n", get_header(req, "From"));
 				transmit_response_reliable(p, "403 Forbidden", req);
 			}
-		}
-
-		pvt_set_needdestroy(p, "authentication failed");
-		return 0;
+
+			pvt_set_needdestroy(p, "authentication failed");
+			return 0;
+		}
 	}
 
 	/* At this point, authpeer cannot be NULL. Remember we hold a reference,