From 15da8f76f0510ba9f3745f8fbc029c8f6b808f09 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sun, 21 Sep 2003 19:32:15 +0000
Subject: [PATCH] search_username now returns Unix-only accounts, too

---
 lam/lib/ldap.inc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lam/lib/ldap.inc b/lam/lib/ldap.inc
index 742a8bdf..aeee401c 100644
--- a/lam/lib/ldap.inc
+++ b/lam/lib/ldap.inc
@@ -123,14 +123,7 @@ class Ldap{
 	// searches LDAP for a specific user name
 	// and returns its DN entry
 	function search_username($name) {
-		if ($this->conf->is_samba3()) {
-			// users have the attribute "posixAccount" or "sambaSamAccount" and uid $name
-			$filter = "(&(objectClass=sambaSamAccount) (uid=$name))";
-		}
-		else {
-			// users have the attribute "posixAccount" or "sambaAccount" and uid $name
-			$filter = "(&(objectClass=sambaAccount) (uid=$name))";
-		}
+		$filter = "(uid=$name)";
 		$attrs = array();
 		$sr = @ldap_search($this->server, $this->conf->get_UserSuffix(), $filter, $attrs);
 		if ($sr) {