repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 85abfd84beee0a5fc6725624b0bd0260c7b2d856:
path_to: 
revision_to: 
git.thebackupbox.net
ngircd
git clone git://git.thebackupbox.net/ngircd
commit 85abfd84beee0a5fc6725624b0bd0260c7b2d856
Author: Brett Smith 
Date:   Fri Sep 14 11:56:38 2012 -0400

    Allow limited punctuation in usernames, for better PAM integration.

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 9e1abdd59e8b0349b535b9b1299989f994a3827c..
index ..74d8b9d116b3bb71de2388a0c71838f0c86f4e29 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;

-----END OF PAGE-----