From a7e7f3fc3899bb937f58dc7493fab5c792a2b0ac Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 4 Jun 2004 11:26:24 +0000 Subject: [PATCH] modules now control if uid may end with '$' or not --- lam/templates/lists/listhosts.php | 2 +- lam/templates/lists/listusers.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lam/templates/lists/listhosts.php b/lam/templates/lists/listhosts.php index 6ff5e4c7..36b8b9ba 100644 --- a/lam/templates/lists/listhosts.php +++ b/lam/templates/lists/listhosts.php @@ -160,7 +160,7 @@ for ($k = 0; $k < sizeof($desc_array); $k++) { if (! $_GET['norefresh']) { // configure search filter $module_filter = get_ldap_filter("host"); // basic filter is provided by modules - $filter = "(&(uid=*$)" . $module_filter; // hosts end with "$" + $filter = "(&" . $module_filter; for ($k = 0; $k < sizeof($desc_array); $k++) { if (eregi("^([0-9a-z_\\*\\+\\-])+$", $_POST["filter" . strtolower($attr_array[$k])])) $filter = $filter . "(" . strtolower($attr_array[$k]) . "=" . diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php index 828d5561..c2200b61 100644 --- a/lam/templates/lists/listusers.php +++ b/lam/templates/lists/listusers.php @@ -194,7 +194,7 @@ for ($k = 0; $k < sizeof($desc_array); $k++) { // configure search filter for LDAP $module_filter = get_ldap_filter("user"); // basic filter is provided by modules -$filter = "(&(!(uid=*$))" . $module_filter; // users do not end with "$" +$filter = "(&" . $module_filter; // users do not end with "$" for ($k = 0; $k < sizeof($desc_array); $k++) { if (eregi("^([0-9a-z_\\*\\+\\-])+$", $_POST["filter" . strtolower($attr_array[$k])])) $filter = $filter . "(" . strtolower($attr_array[$k]) . "=" .