[asterisk-commits] twilson: branch 1.8 r301683 - in /branches/1.8: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Jan 12 15:19:48 2011
New Revision: 301683

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301683
Log:
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:
    branches/1.8/   (props changed)
    branches/1.8/channels/chan_sip.c

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

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=301683&r1=301682&r2=301683
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Wed Jan 12 15:19:48 2011
@@ -23200,10 +23200,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,