From 15818328794e2448437aff5826d98d08a3390626 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 8 Nov 2013 18:14:06 +0000 Subject: [PATCH] allow "#" in user names --- lam/lib/account.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lam/lib/account.inc b/lam/lib/account.inc index a1668576..9e6109c3 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -460,17 +460,17 @@ function get_preg($argument, $regexp) { case 'groupname': // all letters, numbers, space and ._- are allowed characters case 'username': case 'hostname': - $pregexpr = '/^([[:alnum:]@\\.\\ \\_\\$-])+$/u'; + $pregexpr = '/^([[:alnum:]#@\\.\\ \\_\\$-])+$/u'; break; case 'krbUserName': - $pregexpr = '/^([[:alnum:]@\\/\\.\\ \\_\\$-])+$/u'; + $pregexpr = '/^([[:alnum:]#@\\/\\.\\ \\_\\$-])+$/u'; break; case 'hostObject': $pregexpr = '/^[!]?([[:alnum:]@\\.\\ \\_\\$\\*-])+$/u'; break; case 'usernameList': // comma separated list of user names case 'groupnameList': // comma separated list of group names - $pregexpr = '/^([[:alnum:]@\\.\\ \\_-])+(,([[:alnum:]@\\.\\ \\_-])+)*$/u'; + $pregexpr = '/^([[:alnum:]#@\\.\\ \\_-])+(,([[:alnum:]#@\\.\\ \\_-])+)*$/u'; break; case 'realname': // Allow all but \, <, >, =, $, ? case 'cn':