diff --git a/lam/HISTORY b/lam/HISTORY index c91d186e..f99f0d84 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -6,6 +6,7 @@ June 2010 3.1.0 -> custom scripts: new options to hide executed commands and define if output is HTML or plain text - fixed bugs: -> Asterisk password handling (patch 2979728) + -> Samba domain SID check (2994528) 24.03.2010 3.0.0 diff --git a/lam/lib/account.inc b/lam/lib/account.inc index a2ceb485..15c366e1 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -387,8 +387,8 @@ function get_preg($argument, $regexp) { $pregexpr = '/^([[:alnum:]@\\.\\ \\_\\$-])+$/u'; break; case 'hostObject': - $pregexpr = '/^[!]?([[:alnum:]@\\.\\ \\_\\$\\*-])+$/u'; - break; + $pregexpr = '/^[!]?([[:alnum:]@\\.\\ \\_\\$\\*-])+$/u'; + break; case 'usernameList': // comma separated list of user names case 'groupnameList': // comma separated list of group names $pregexpr = '/^([[:alnum:]@\\.\\ \\_-])+(,([[:alnum:]@\\.\\ \\_-])+)*$/u'; @@ -470,6 +470,7 @@ function get_preg($argument, $regexp) { break; case 'domainSID': // Samba domain SID $pregexpr = "/^S\\-[0-9]\\-[0-9]\\-[0-9]{2,2}\\-[0-9]+\\-[0-9]+\\-[0-9]+$/"; + break; case 'ip': // IP address $pregexpr = '/^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}$/'; break;