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

Fixed cache (memberUid) 

fixed wrong SID for new groups
removed spaces from sambauserworkstations
This commit is contained in:
katagia 2003-11-17 12:10:41 +00:00
parent cb6c900276
commit 7aa3dae1e0
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lam/lib/account.inc
View File

@ -1449,9 +1449,8 @@ function createuser($values, $uselamdaemon=true) {
$success = ldap_mod_add($_SESSION['ldap']->server(), $dn, array('memberUid' => $values->general_username)); $success = ldap_mod_add($_SESSION['ldap']->server(), $dn, array('memberUid' => $values->general_username));
if (!$success) return 4; if (!$success) return 4;
// Add new memberUid to cache-array // Add new memberUid to cache-array
if ((isset($_SESSION['groupDN']))) { ldapreload('group');
if (!in_array($values->general_username, $_SESSION['groupDN'][$dn]['memberUid'])) $_SESSION['groupDN'][$dn]['memberUid'][] = $_SESSION['groupDN'][$dn]['memberUid']; $_SESSION['groupDN'][$dn]['memberUid'][] = $values->general_username;
}
} }
// Add new user to cache-array // Add new user to cache-array
if ((isset($_SESSION['userDN']))) { if ((isset($_SESSION['userDN']))) {
@ -1902,16 +1901,17 @@ function modifyuser($values,$values_old,$uselamdaemon=true) { // Will modify the
if ($attr2['memberUid']) { if ($attr2['memberUid']) {
// Remove user from groups he's not member anymore // Remove user from groups he's not member anymore
if (@in_array($values->general_username, $attr2['memberUid']) && !@in_array($attr2['cn'][0],$values->general_groupadd)) { if (@in_array($values->general_username, $attr2['memberUid']) && !@in_array($attr2['cn'][0],$values->general_groupadd)) {
print "1";
$dn = ldap_get_dn($_SESSION['ldap']->server(), $entry); $dn = ldap_get_dn($_SESSION['ldap']->server(), $entry);
$success = ldap_mod_del($_SESSION['ldap']->server(), $dn ,array('memberUid' => $values->general_username)); $success = ldap_mod_del($_SESSION['ldap']->server(), $dn ,array('memberUid' => $values->general_username));
if (!$success) return 5; if (!$success) return 5;
// Remove old memberUid to cache-array // Remove old memberUid to cache-array
ldapreload('group');
if ((isset($_SESSION['groupDN']))) { if ((isset($_SESSION['groupDN']))) {
if (!in_array($values->general_username, $_SESSION['groupDN'][$dn]['memberUid'])) { for ($i=0; $i<count($_SESSION['groupDN'][$dn]['memberUid']); $i++) {
$i=0; if ($values->general_username==$_SESSION['groupDN'][$dn]['memberUid'][$i]) {
for ($i=0; $i<count($dn); $i++) { unset($_SESSION['groupDN'][$dn]['memberUid'][$i]);
if ($_SESSION['groupDN'][$dn]['memberUid'][$i] == $values->general_username) unset ($_SESSION['groupDN'][$dn]['memberUid'][$i]); $_SESSION['groupDN'][$dn]['memberUid'] = array_values($_SESSION['groupDN'][$dn]['memberUid']);
$_SESSION['groupDN'][$dn]['memberUid'][$i] = array_values($_SESSION['groupDN'][$dn]['memberUid'][$i]);
} }
} }
} }
@ -1922,8 +1922,12 @@ function modifyuser($values,$values_old,$uselamdaemon=true) { // Will modify the
$success = ldap_mod_add($_SESSION['ldap']->server(), $dn ,array('memberUid' => $values->general_username)); $success = ldap_mod_add($_SESSION['ldap']->server(), $dn ,array('memberUid' => $values->general_username));
if (!$success) return 5; if (!$success) return 5;
// Add new memberUid to cache-array // Add new memberUid to cache-array
ldapreload('group');
if ((isset($_SESSION['groupDN']))) { if ((isset($_SESSION['groupDN']))) {
if (!in_array($values->general_username, $_SESSION['groupDN'][$dn]['memberUid'])) $_SESSION['groupDN'][$dn]['memberUid'][] = $_SESSION['groupDN'][$dn]['memberUid']; if (is_array($_SESSION['groupDN'][$dn]['memberUid'])) {
if (!in_array($values->general_username, $_SESSION['groupDN'][$dn]['memberUid'])) $_SESSION['groupDN'][$dn]['memberUid'][] = $values->general_username;
}
else $_SESSION['groupDN'][$dn]['memberUid'][] = $values->general_username;
} }
} }
} }
@ -1934,8 +1938,12 @@ function modifyuser($values,$values_old,$uselamdaemon=true) { // Will modify the
$success = ldap_mod_add($_SESSION['ldap']->server(), $dn ,array('memberUid' => $values->general_username)); $success = ldap_mod_add($_SESSION['ldap']->server(), $dn ,array('memberUid' => $values->general_username));
if (!$success) return 5; if (!$success) return 5;
// Add new memberUid to cache-array // Add new memberUid to cache-array
ldapreload('group');
if ((isset($_SESSION['groupDN']))) { if ((isset($_SESSION['groupDN']))) {
if (!in_array($values->general_username, $_SESSION['groupDN'][$dn]['memberUid'])) $_SESSION['groupDN'][$dn]['memberUid'][] = $_SESSION['groupDN'][$dn]['memberUid']; if (is_array($_SESSION['groupDN'][$dn]['memberUid'])) {
if (!in_array($values->general_username, $_SESSION['groupDN'][$dn]['memberUid'])) $_SESSION['groupDN'][$dn]['memberUid'][] = $values->general_username;
}
else $_SESSION['groupDN'][$dn]['memberUid'][] = $values->general_username;
} }
} }
} }
@ -1996,7 +2004,7 @@ function createhost($values) {
$attr['sambaLMPassword'] = '01FC5A6BE7BC6929AAD3B435B51404EE'; $attr['sambaLMPassword'] = '01FC5A6BE7BC6929AAD3B435B51404EE';
$attr['sambaPwdLastSet'] = time(); // sambaAccount_may $attr['sambaPwdLastSet'] = time(); // sambaAccount_may
$attr['sambaSID'] = $values->smb_domain->SID . "-" . (2 * $values->general_uidNumber + $values->smb_domain->RIDbase); // sambaAccount_may $attr['sambaSID'] = $values->smb_domain->SID . "-" . (2 * $values->general_uidNumber + $values->smb_domain->RIDbase); // sambaAccount_may
$attr['sambaPrimaryGroupSID'] = $values->smb_domain->SID . "-" . (2 * getgid($values->general_group) + $values->smb_domain->RIDbase +1); // sambaAccount_req $attr['sambaPrimaryGroupSID'] = $values->smb_domain->SID . "-515"; // sambaAccount_req
$attr['sambaPwdCanChange'] = time(); // sambaAccount_may $attr['sambaPwdCanChange'] = time(); // sambaAccount_may
$attr['sambaPwdMustChange'] = "1893452400"; // sambaAccount_may // anywhere in year 2030 $attr['sambaPwdMustChange'] = "1893452400"; // sambaAccount_may // anywhere in year 2030
$attr['sambaAcctFlags'] = smbflag($values); // sambaAccount_may $attr['sambaAcctFlags'] = smbflag($values); // sambaAccount_may

2
lam/templates/account/groupedit.php
View File

@ -237,7 +237,7 @@ switch ($_POST['select']) {
case '*'._('Domain Admins'): $account_new->smb_mapgroup = $account_new->smb_domain->SID . "-" . '512'; break; case '*'._('Domain Admins'): $account_new->smb_mapgroup = $account_new->smb_domain->SID . "-" . '512'; break;
case $account_new->general_username: case $account_new->general_username:
$account_new->smb_mapgroup = $account_new->smb_domain->SID . "-". $account_new->smb_mapgroup = $account_new->smb_domain->SID . "-".
(2 * getgid($account_new->general_username) + $account_new->smb_domain->RIDbase +1); (2 * $account_new->general_uidNumber + $account_new->smb_domain->RIDbase +1);
break; break;
} }
// Check if values are OK and set automatic values. if not error-variable will be set // Check if values are OK and set automatic values. if not error-variable will be set

2
lam/templates/account/useredit.php
View File

@ -193,7 +193,7 @@ switch ($_POST['select']) {
// Recreate workstation string // Recreate workstation string
$account_new->smb_smbuserworkstations = $workstations[0]; $account_new->smb_smbuserworkstations = $workstations[0];
for ($i=1; $i<count($workstations); $i++) { for ($i=1; $i<count($workstations); $i++) {
$account_new->smb_smbuserworkstations = $account_new->smb_smbuserworkstations . ", " . $workstations[$i]; $account_new->smb_smbuserworkstations = $account_new->smb_smbuserworkstations . "," . $workstations[$i];
} }
break; break;
} }