WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed Samba domain SID check (2994528)

This commit is contained in:
Roland Gruber 2010-04-30 21:08:23 +00:00
parent 4de8edd20d
commit b5086bc156
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lam/HISTORY
View File

@ -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 -> custom scripts: new options to hide executed commands and define if output is HTML or plain text
- fixed bugs: - fixed bugs:
-> Asterisk password handling (patch 2979728) -> Asterisk password handling (patch 2979728)
-> Samba domain SID check (2994528)
24.03.2010 3.0.0 24.03.2010 3.0.0

5
lam/lib/account.inc
View File

@ -387,8 +387,8 @@ function get_preg($argument, $regexp) {
$pregexpr = '/^([[:alnum:]@\\.\\ \\_\\$-])+$/u'; $pregexpr = '/^([[:alnum:]@\\.\\ \\_\\$-])+$/u';
break; break;
case 'hostObject': case 'hostObject':
$pregexpr = '/^[!]?([[:alnum:]@\\.\\ \\_\\$\\*-])+$/u'; $pregexpr = '/^[!]?([[:alnum:]@\\.\\ \\_\\$\\*-])+$/u';
break; break;
case 'usernameList': // comma separated list of user names case 'usernameList': // comma separated list of user names
case 'groupnameList': // comma separated list of group names case 'groupnameList': // comma separated list of group names
$pregexpr = '/^([[:alnum:]@\\.\\ \\_-])+(,([[:alnum:]@\\.\\ \\_-])+)*$/u'; $pregexpr = '/^([[:alnum:]@\\.\\ \\_-])+(,([[:alnum:]@\\.\\ \\_-])+)*$/u';
@ -470,6 +470,7 @@ function get_preg($argument, $regexp) {
break; break;
case 'domainSID': // Samba domain SID case 'domainSID': // Samba domain SID
$pregexpr = "/^S\\-[0-9]\\-[0-9]\\-[0-9]{2,2}\\-[0-9]+\\-[0-9]+\\-[0-9]+$/"; $pregexpr = "/^S\\-[0-9]\\-[0-9]\\-[0-9]{2,2}\\-[0-9]+\\-[0-9]+\\-[0-9]+$/";
break;
case 'ip': // IP address case 'ip': // IP address
$pregexpr = '/^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}$/'; $pregexpr = '/^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}$/';
break; break;