From f629cbcbfd3db565d29ed426be7429b60333d2c0 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 19 Sep 2003 12:30:58 +0000 Subject: [PATCH] fixed search filter; show all posixAccount users --- lam/templates/lists/listusers.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php index 3956d13f..498e9b9d 100644 --- a/lam/templates/lists/listusers.php +++ b/lam/templates/lists/listusers.php @@ -162,15 +162,8 @@ for ($k = 0; $k < sizeof($desc_array); $k++) { } // configure search filter -// Users have the attribute "*" - if ($_SESSION['config']->is_samba3()) { - // Unix/Samba3 users do not have the attribute "sambaAccount" but "posixAccount" and do not end with "$" - $filter = "(&(objectClass=posixAccount) (!(objectClass=sambaAccount)) (!(uid=*$))"; - } - else { - // Unix/Samba2 users do not have the attribute "sambaSamAccount" but "posixAccount" and do not end with "$" - $filter = "(&(objectClass=posixAccount) (!(objectClass=sambaSamAccount)) (!(uid=*$))"; - } +// Unix/Samba3 users have the attribute "posixAccount" and do not end with "$" +$filter = "(&(objectClass=posixAccount) (!(uid=*$))"; for ($k = 0; $k < sizeof($desc_array); $k++) { if ($_POST["filter" . strtolower($attr_array[$k])]) $filter = $filter . "(" . strtolower($attr_array[$k]) . "=" .