michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-05 23:00:28 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't set userPassword if not needed https://sourceforge.net/tracker/index.php?func=detail&aid=3592714&group_id=17457&atid=117457#

Browse Source
This commit is contained in:
Jamie Cameron
2012-12-12 14:46:50 -08:00
parent 1c4412a325
commit af9f02a274
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ldap-useradmin/CHANGELOG
View File

@@ -75,3 +75,5 @@ Added a field for editing the description for LDAP groups.
The list of groups now includes descriptions, if any are set.
---- Changes since 1.520 ----
Added Module Config options for additional LDAP filters to find users and groups, in addition to the posixAccount / posixGroup object class filters.
---- Changes since 1.610 ----
The userPassword attribute is now removed for users or groups that don't have a password set.

7
ldap-useradmin/save_user.cgi
View File

@@ -360,7 +360,7 @@ else {
"loginShell" => $shell,
"homeDirectory" => $home,
"gidNumber" => $gid,
"userPassword" => $pass,
$pass ? ( "userPassword" => $pass ) : ( ),
"objectClass" => \@classes,
@props );
if (&indexoflc("person", @classes) >= 0 &&
@@ -548,7 +548,7 @@ else {
"loginShell" => $shell,
"homeDirectory" => $home,
"gidNumber" => $gid,
"userPassword" => $pass,
$pass ? ( "userPassword" => $pass ) : ( ),
"objectClass" => \@classes,
@props );
if (&indexoflc("person", @classes) >= 0 &&
@@ -556,6 +556,9 @@ else {
# Person needs 'sn'
$allprops{'sn'} = $real;
}
if (!$pass) {
push(@rprops, "userPassword");
}
$rv = $ldap->modify($newdn, 'replace' => \%allprops,
'delete' => \@rprops);
if ($rv->code) {