deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

SF Bug #3004012 - password sync for sambaSamAccount template broken.

Browse Source
This commit is contained in:
Deon George 2011-04-27 23:09:43 +10:00
parent 9e9960bc3d
commit d5c8d42adc
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/AttributeFactory.php
View File

@ -83,6 +83,9 @@ class AttributeFactory {
if (isset($values['type'])) if (isset($values['type']))
switch ($values['type']) { switch ($values['type']) {
case 'password': case 'password':
if (! strcasecmp($name,'sambaLMPassword') || ! strcasecmp($name,'sambaNTPassword'))
return $this->newSambaPasswordAttribute($name,$values,$server_id,$source);
else
return $this->newPasswordAttribute($name,$values,$server_id,$source); return $this->newPasswordAttribute($name,$values,$server_id,$source);
case 'multiselect': case 'multiselect':

8
lib/PageRender.php
View File

@ -189,6 +189,9 @@ class PageRender extends Visitor {
$blank++; $blank++;
} }
} elseif (count($attribute2->getValues()) == 0) {
return;
} elseif (count($attribute2->getValues()) != 1) { } elseif (count($attribute2->getValues()) != 1) {
array_push($values,''); array_push($values,'');
$blank++; $blank++;
@ -231,6 +234,9 @@ class PageRender extends Visitor {
return; return;
} }
if (! $attribute->hasBeenModified())
return;
# Get the attribute. # Get the attribute.
if (preg_match_all('/%(\w+)(\|.+)?(\/[lU])?%/U',strtolower($args[1]),$matchall)) { if (preg_match_all('/%(\w+)(\|.+)?(\/[lU])?%/U',strtolower($args[1]),$matchall)) {
if (count($matchall[1]) != 1) if (count($matchall[1]) != 1)
@ -272,7 +278,7 @@ class PageRender extends Visitor {
case 'nt': case 'nt':
$sambapassword = new smbHash; $sambapassword = new smbHash;
$vals[$i] = $sambapassword->nthash($passwordvalue); break; $vals[$i] = $sambapassword->nthash($passwordvalue);
break; break;