The default "ldap filter" is (uid=%u), not (&(uid=%u)(objectclass=sambaAccount))

diff --git a/trunk/Samba-HOWTO-Collection/Passdb.xml b/trunk/Samba-HOWTO-Collection/Passdb.xml
index 42742db6bdf73e549a2f4c98e9c658cabee5d0e9..53767e92726dc477c87b49d9453a09eed81d40c7 100644 (file)
--- a/trunk/Samba-HOWTO-Collection/Passdb.xml
+++ b/trunk/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/trunk/smbdotconf/ldap/ldapfilter.xml b/trunk/smbdotconf/ldap/ldapfilter.xml
index eba6a76f9554eaed8abd8f14af00cfcca97d4cf8..0d2a187e130a083038e4af22f063f4edbe2871b0 100644 (file)
--- a/trunk/smbdotconf/ldap/ldapfilter.xml
+++ b/trunk/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>