From e67941f5cb7bd0f1d7ac4a98e5613187224653dd Mon Sep 17 00:00:00 2001
From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 10 Dec 2008 16:37:14 +0000
Subject: [PATCH] Merged revisions 162664 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
r162664 | mmichelson | 2008-12-10 10:34:35 -0600 (Wed, 10 Dec 2008) | 19 lines

Merged revisions 162663 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r162663 | mmichelson | 2008-12-10 10:24:56 -0600 (Wed, 10 Dec 2008) | 11 lines

Revert fix for issue 13570. It has caused more problems than
it helped to fix.

(closes issue #13783)
Reported by: navkumar


(closes issue #14025)
Reported by: ffs


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@162666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_sip.c | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f25153ff6c..b2b19c377e 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6402,7 +6402,6 @@ static int sip_register(const char *value, int lineno)
 	char *port = NULL;
 	char *hostname=NULL, *secret=NULL, *authuser=NULL, *expire=NULL;
 	char *callback=NULL;
-	char *reserved = NULL;
 
 	if (!value)
 		return -1;
@@ -6427,15 +6426,7 @@ static int sip_register(const char *value, int lineno)
 		if (authuser)
 			*authuser++ = '\0';
 	}
-	if ((reserved = strpbrk(username, SIP_RESERVED))) {
-		goto invalid_char;
-	}
-	if (!ast_strlen_zero(secret) && (reserved = strpbrk(secret, SIP_RESERVED))) {
-		goto invalid_char;
-	}
-	if (!ast_strlen_zero(authuser) && (reserved = strpbrk(authuser, SIP_RESERVED))) {
-		goto invalid_char;
-	}
+
 	/* split host[:port][/contact] */
 	expire = strchr(hostname, '~');
 	if (expire)
@@ -6450,9 +6441,6 @@ static int sip_register(const char *value, int lineno)
 	if ((port = strchr(hostname, ':'))) {
 		*port = '\0';
 	}
-	if ((reserved = strpbrk(hostname, SIP_RESERVED))) {
-		goto invalid_char;
-	}
 	/* And then re-merge the host and port so they are stored correctly
 	 */
 	if (port) {
@@ -6491,10 +6479,6 @@ static int sip_register(const char *value, int lineno)
 	ASTOBJ_CONTAINER_LINK(&regl, reg); /* Add the new registry entry to the list */
 	registry_unref(reg, "unref the reg pointer");	/* release the reference given by ASTOBJ_INIT. The container has another reference */
 	return 0;
-
-invalid_char:
-	ast_log(LOG_ERROR, "A reserved character ('%c') was used in a \"register\" line. This registration will not occur\n", *reserved);
-	return -1;
 }
 
 /*! \brief  Parse multiline SIP headers into one header