[svn-commits] lmadsen: tag 1.6.2.18.2 r325278 - in /tags/1.6.2.18.2: ./ channels/

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Tue Jun 28 15:07:24 2011
New Revision: 325278

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325278
Log:
Update ChangeLog, .version, and merge changes
per AST-2011-011

Removed:
    tags/1.6.2.18.2/asterisk-1.6.2.18.1-summary.html
    tags/1.6.2.18.2/asterisk-1.6.2.18.1-summary.txt
Modified:
    tags/1.6.2.18.2/.version
    tags/1.6.2.18.2/ChangeLog
    tags/1.6.2.18.2/channels/chan_sip.c

Modified: tags/1.6.2.18.2/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.18.2/.version?view=diff&rev=325278&r1=325277&r2=325278
==============================================================================
--- tags/1.6.2.18.2/.version (original)
+++ tags/1.6.2.18.2/.version Tue Jun 28 15:07:24 2011
@@ -1,1 +1,1 @@
-1.6.2.18.1
+1.6.2.18.2

Modified: tags/1.6.2.18.2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.18.2/ChangeLog?view=diff&rev=325278&r1=325277&r2=325278
==============================================================================
--- tags/1.6.2.18.2/ChangeLog (original)
+++ tags/1.6.2.18.2/ChangeLog Tue Jun 28 15:07:24 2011
@@ -1,3 +1,9 @@
+2011-06-28  Leif Madsen <lmadsen at digium.com>
+
+	* Asterisk 1.6.2.18.2 Released.
+
+	* AST-2011-011
+
 2011-06-22  Leif Madsen <lmadsen at digium.com>
 
 	* Asterisk 1.6.2.18.1 Released.

Modified: tags/1.6.2.18.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.18.2/channels/chan_sip.c?view=diff&rev=325278&r1=325277&r2=325278
==============================================================================
--- tags/1.6.2.18.2/channels/chan_sip.c (original)
+++ tags/1.6.2.18.2/channels/chan_sip.c Tue Jun 28 15:07:24 2011
@@ -13353,9 +13353,9 @@
 {
 	/* We have to emulate EXACTLY what we'd get with a good peer
 	 * and a bad password, or else we leak information. */
-	const char *response = "407 Proxy Authentication Required";
-	const char *reqheader = "Proxy-Authorization";
-	const char *respheader = "Proxy-Authenticate";
+	const char *response = "401 Unauthorized";
+	const char *reqheader = "Authorization";
+	const char *respheader = "WWW-Authenticate";
 	const char *authtoken;
 	struct ast_str *buf;
 	char *c;
@@ -13370,23 +13370,18 @@
 		[K_LAST] = { NULL, NULL}
 	};
 
-	if (sipmethod == SIP_REGISTER || sipmethod == SIP_SUBSCRIBE) {
-		response = "401 Unauthorized";
-		reqheader = "Authorization";
-		respheader = "WWW-Authenticate";
-	}
 	authtoken = get_header(req, reqheader);
 	if (req->ignore && !ast_strlen_zero(p->randdata) && ast_strlen_zero(authtoken)) {
 		/* This is a retransmitted invite/register/etc, don't reconstruct authentication
 		 * information */
-		transmit_response_with_auth(p, response, req, p->randdata, 0, respheader, 0);
+		transmit_response_with_auth(p, response, req, p->randdata, reliable, respheader, 0);
 		/* Schedule auto destroy in 32 seconds (according to RFC 3261) */
 		sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
 		return;
 	} else if (ast_strlen_zero(p->randdata) || ast_strlen_zero(authtoken)) {
 		/* We have no auth, so issue challenge and request authentication */
 		set_nonce_randdata(p, 1);
-		transmit_response_with_auth(p, response, req, p->randdata, 0, respheader, 0);
+		transmit_response_with_auth(p, response, req, p->randdata, reliable, respheader, 0);
 		/* Schedule auto destroy in 32 seconds */
 		sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
 		return;
@@ -13645,7 +13640,7 @@
 			}
 		}
 	}
-	if (!peer && sip_cfg.alwaysauthreject) {
+	if (!peer && sip_cfg.alwaysauthreject && ast_test_flag(&p->flags[1], SIP_PAGE2_REGISTERTRYING)) {
 		/* If we found a peer, we transmit a 100 Trying.  Therefore, if we're
 		 * trying to avoid leaking information, we MUST also transmit the same
 		 * response when we DON'T find a peer. */