From: Jilles Tjoelker <redacted>
Date: Fri, 8 Jan 2010 17:13:47 +0000 (+0100)
Subject: Do not change \s in xlines to spaces, match_esc() treats \s correctly.
X-Git-Tag: proposed-charybdis-3.2.0~44
X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/commitdiff_plain/c2e615382b106e0720cc14560a3b164c3002d738?hp=36999fb19452dd274310004257173f050e278184

Do not change \s in xlines to spaces, match_esc() treats \s correctly.

This undoes erroneous revert in a3c064b3b8a2.
---

diff --git a/modules/m_xline.c b/modules/m_xline.c
index ab40172..1ff8655 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -275,42 +275,7 @@ apply_xline(struct Client *source_p, const char *name, const char *reason, int t
 
 	aconf = make_conf();
 	aconf->status = CONF_XLINE;
-
-	if(strstr(name, "\\s"))
-	{
-		char *tmp = LOCAL_COPY(name);
-		char *orig = tmp;
-		char *new = tmp;
-
-		while(*orig)
-		{
-			if(*orig == '\\' && *(orig + 1) != '\0')
-			{
-				if(*(orig + 1) == 's')
-				{
-					*new++ = ' ';
-					orig += 2;
-				}
-				/* otherwise skip that and the escaped
-				 * character after it, so we dont mistake
-				 * \\s as \s --fl
-				 */
-				else
-				{
-					*new++ = *orig++;
-					*new++ = *orig++;
-				}
-			}
-			else
-				*new++ = *orig++;
-		}
-
-		*new = '\0';
-		aconf->host = rb_strdup(tmp);
-	}
-	else
-		aconf->host = rb_strdup(name);
-
+	aconf->host = rb_strdup(name);
 	aconf->passwd = rb_strdup(reason);
 	collapse(aconf->host);