From: Brett Smith <brett@w3.org>
Date: Fri, 14 Sep 2012 15:56:38 +0000 (-0400)
Subject: Allow limited punctuation in usernames, for better PAM integration.
X-Git-Tag: rel-20-rc1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85abfd84beee0a5fc6725624b0bd0260c7b2d856;p=ngircd

Allow limited punctuation in usernames, for better PAM integration.
---

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 9e1abdd5..74d8b9d1 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -418,12 +418,15 @@ IRC_USER(CLIENT * Client, REQUEST * Req)
 						  Client_ID(Client),
 						  Req->command);
 
-		/* User name: only alphanumeric characters are allowed! */
+		/* User name: only alphanumeric characters and limited
+		   punctuation is allowed.*/
 		ptr = Req->argv[0];
 		while (*ptr) {
 			if ((*ptr < '0' || *ptr > '9') &&
 			    (*ptr < 'A' || *ptr > 'Z') &&
-			    (*ptr < 'a' || *ptr > 'z')) {
+			    (*ptr < 'a' || *ptr > 'z') &&
+			    (*ptr != '+') && (*ptr != '-') &&
+			    (*ptr != '.') && (*ptr != '_')) {
 				Conn_Close(Client_Conn(Client), NULL,
 					   "Invalid user name", true);
 				return DISCONNECTED;