From b3409c7a44c07883c9bf8804fb51d88bbabca875 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 1 Jul 2004 20:04:55 +0000
Subject: The default "ldap filter" is (uid=%u), not
 (&(uid=%u)(objectclass=sambaAccount)) (This used to be commit
 7f3cca4841112af21209de78ea817d301dfe5520)

---
 docs/Samba-HOWTO-Collection/Passdb.xml | 2 +-
 docs/smbdotconf/ldap/ldapfilter.xml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/Samba-HOWTO-Collection/Passdb.xml b/docs/Samba-HOWTO-Collection/Passdb.xml
index 42742db6bd..53767e9272 100644
--- a/docs/Samba-HOWTO-Collection/Passdb.xml
+++ b/docs/Samba-HOWTO-Collection/Passdb.xml
@@ -1122,7 +1122,7 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz
 <smbconfoption><name>ldap suffix</name><value>dc=quenya,dc=org</value></smbconfoption>
 
 <smbconfcomment> generally the default ldap search filter is ok</smbconfcomment>
-<smbconfoption><name>ldap filter</name><value>(&amp;(uid=%u)(objectclass=sambaSamAccount))</value></smbconfoption>
+<smbconfoption><name>ldap filter</name><value>(uid=%u)</value></smbconfoption>
 </smbconfexample>
 </para>
 
diff --git a/docs/smbdotconf/ldap/ldapfilter.xml b/docs/smbdotconf/ldap/ldapfilter.xml
index eba6a76f95..0d2a187e13 100644
--- a/docs/smbdotconf/ldap/ldapfilter.xml
+++ b/docs/smbdotconf/ldap/ldapfilter.xml
@@ -6,9 +6,9 @@
 <description>
 	<para>This parameter specifies the RFC 2254 compliant LDAP search filter.
 	The default is to match the login name with the <constant>uid</constant> 
-	attribute for all entries matching the <constant>sambaAccount</constant>		
-	objectclass.  Note that this filter should only return one entry.
+	attribute. Note that this filter should only return one entry.
 </para>
 </description>
-<value type="default">(&amp;(uid=%u)(objectclass=sambaAccount))</value>
+<value type="default">(uid=%u)</value>
+<value type="example">(&amp;(uid=%u)(objectclass=sambaSamAccount))</value>
 </samba:parameter>
-- 
cgit