From 8e9defe4de66c87c6145d535815fbdffd59dc15d Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 8 Nov 2010 15:01:56 -0800
Subject: [PATCH] Allow @ in usernames
 https://sourceforge.net/tracker/?func=detail&atid=117457&aid=3105441&group_id=17457

---
 cluster-webmin/save_group.cgi | 2 +-
 cluster-webmin/save_user.cgi  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster-webmin/save_group.cgi b/cluster-webmin/save_group.cgi
index c323a6b77..6614e3693 100755
--- a/cluster-webmin/save_group.cgi
+++ b/cluster-webmin/save_group.cgi
@@ -15,7 +15,7 @@ foreach $h (@allhosts) {
 	}
 
 # Validate inputs
-$in{'name'} =~ /^[A-z0-9\-\_\.]+$/ ||
+$in{'name'} =~ /^[A-z0-9\-\_\.\@]+$/ ||
 	&error(&text('group_ename', $in{'name'}));
 $in{'name'} ne $in{'old'} && $taken{$in{'name'}} &&
 	&error(&text('group_etaken', $in{'name'}));
diff --git a/cluster-webmin/save_user.cgi b/cluster-webmin/save_user.cgi
index 13896e8c6..3af853c4b 100755
--- a/cluster-webmin/save_user.cgi
+++ b/cluster-webmin/save_user.cgi
@@ -15,7 +15,7 @@ foreach $h (@allhosts) {
 	}
 
 # Validate inputs
-$in{'name'} =~ /^[A-z0-9\-\_\.]+$/ ||
+$in{'name'} =~ /^[A-z0-9\-\_\.\@]+$/ ||
 	&error(&text('user_ename', $in{'name'}));
 $in{'name'} ne $in{'old'} && $taken{$in{'name'}} &&
 	&error(&text('user_etaken', $in{'name'}));