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

fixed bug in groupDN-cache 

changed lamdaemon.pl to return stdout only once.
This commit is contained in:
katagia 2003-11-13 19:56:10 +00:00
parent d1541119ad
commit 543f0d4119
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lam/lib/account.inc
View File

@ -2299,8 +2299,7 @@ function creategroup($values, $uselamdaemon=true) {
if ($values->smb_displayName) $attr['displayName'] = utf8_encode($values->smb_displayName); if ($values->smb_displayName) $attr['displayName'] = utf8_encode($values->smb_displayName);
} }
// Write additional group members // Write additional group members
if (is_array($values->unix_memberUid)) foreach ($values->unix_memberUid as $user) if (is_array($values->unix_memberUid)) $attr['memberUid'][] = $values->unix_memberUid;
$attr['memberUid'][] = $user;
// Create LDAP group account // Create LDAP group account
$success = ldap_add($_SESSION['ldap']->server(),$values->general_dn, $attr); $success = ldap_add($_SESSION['ldap']->server(),$values->general_dn, $attr);
// Continue if now error did ocour // Continue if now error did ocour
@ -2309,7 +2308,7 @@ function creategroup($values, $uselamdaemon=true) {
if ($_SESSION['config']->scriptServer && is_array($values->quota) && $uselamdaemon) setquotas(array($values)); if ($_SESSION['config']->scriptServer && is_array($values->quota) && $uselamdaemon) setquotas(array($values));
// Add new group to cache-array // Add new group to cache-array
if ((isset($_SESSION['groupDN']))) { if ((isset($_SESSION['groupDN']))) {
$_SESSION['groupDN'][$dn]['memberUid'] = $user; $_SESSION['groupDN'][$values->general_dn]['memberUid'] = $values->unix_memberUid;
$_SESSION['groupDN'][$values->general_dn]['cn'] = $values->general_username; $_SESSION['groupDN'][$values->general_dn]['cn'] = $values->general_username;
$_SESSION['groupDN'][$values->general_dn]['uidNumber'] = $values->general_uidNumber; $_SESSION['groupDN'][$values->general_dn]['uidNumber'] = $values->general_uidNumber;
} }

3
lam/lib/lamdaemon.pl
View File

@ -216,6 +216,7 @@ else {
$ssh->login($username[0], $password); $ssh->login($username[0], $password);
foreach $string2 ( @string ) { foreach $string2 ( @string ) {
($stdout, $stderr, $exit) = $ssh->cmd("sudo $remotepath $argv", $string2); ($stdout, $stderr, $exit) = $ssh->cmd("sudo $remotepath $argv", $string2);
print "$stdout"; $return .= $stdout;
} }
print "$return";
} }