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

run search_domains only once in loaduser

This commit is contained in:
katagia 2003-11-12 11:40:23 +00:00
parent 6e87054468
commit f8bb2f127b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lam/lib/account.inc
View File

@ -944,9 +944,13 @@ function loaduser($dns) {
/* if string is langer then 1024 characters we have to search for all users and /* if string is langer then 1024 characters we have to search for all users and
* output only the selcted users because searchfilter would be too big * output only the selcted users because searchfilter would be too big
*/ */
if (strlen($search<1024)) $result = ldap_search($_SESSION['ldap']->server(), $_SESSION['config']->get_UserSuffix(), $search); if (strlen($search)<1024) $result = ldap_search($_SESSION['ldap']->server(), $_SESSION['config']->get_UserSuffix(), $search);
else $result = ldap_search($_SESSION['ldap']->server(), $_SESSION['config']->get_UserSuffix()); else $result = ldap_search($_SESSION['ldap']->server(), $_SESSION['config']->get_UserSuffix());
$entry = ldap_first_entry($_SESSION['ldap']->server(), $result); $entry = ldap_first_entry($_SESSION['ldap']->server(), $result);
// store smb_domain as samba3domain-Object
if ($_SESSION['config']->is_samba3()) $samba3domains = $_SESSION['ldap']->search_domains($_SESSION[config]->get_domainSuffix());
// loop for every found user // loop for every found user
$i=0; $i=0;
while ($entry) { while ($entry) {
@ -1053,8 +1057,6 @@ function loaduser($dns) {
if (isset($attr['sambaNTPassword'][0])) $return[$i]->smb_password = $attr['sambaNTPassword'][0]; if (isset($attr['sambaNTPassword'][0])) $return[$i]->smb_password = $attr['sambaNTPassword'][0];
if (isset($attr['sambaDomainName'][0])) { if (isset($attr['sambaDomainName'][0])) {
if ($_SESSION['config']->is_samba3()) { if ($_SESSION['config']->is_samba3()) {
// store smb_domain as samba3domain-Object
$samba3domains = $_SESSION['ldap']->search_domains($_SESSION[config]->get_domainSuffix());
$j=0; $j=0;
while (!isset($return[$i]->smb_domain) && (count($samba3domains)>$j)) { while (!isset($return[$i]->smb_domain) && (count($samba3domains)>$j)) {
if ($attr['sambaDomainName'][0] == $samba3domains[$j]->name) if ($attr['sambaDomainName'][0] == $samba3domains[$j]->name)
@ -1091,8 +1093,6 @@ function loaduser($dns) {
if (isset($attr['userWorkstations'][0])) $return[$i]->smb_smbuserworkstations = $attr['userWorkstations'][0]; if (isset($attr['userWorkstations'][0])) $return[$i]->smb_smbuserworkstations = $attr['userWorkstations'][0];
if (isset($attr['domain'][0])) { if (isset($attr['domain'][0])) {
if ($_SESSION['config']->is_samba3()) { if ($_SESSION['config']->is_samba3()) {
// store smb_domain as samba3domain-Object
$samba3domains = $_SESSION['ldap']->search_domains($_SESSION[config]->get_domainSuffix());
$j=0; $j=0;
while (!isset($return[$i]->smb_domain) && (count($samba3domains)>$j)) { while (!isset($return[$i]->smb_domain) && (count($samba3domains)>$j)) {
if ($attr['domain'][0] == $samba3domains[$j]->name) if ($attr['domain'][0] == $samba3domains[$j]->name)