diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-07-01 20:04:55 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 11:51:10 -0500 |
| commit | 37f071a22bd3b6bb2d27422eeb3c473e50d4ee51 (patch) | |
| tree | 0083bba97443117848ee0aef99feb5e7f0ffd686 | |
| parent | 4fe786a488bb32d988891ddbc431c72c6f740c7c (diff) | |
| download | samba-37f071a22bd3b6bb2d27422eeb3c473e50d4ee51.tar.gz samba-37f071a22bd3b6bb2d27422eeb3c473e50d4ee51.tar.xz samba-37f071a22bd3b6bb2d27422eeb3c473e50d4ee51.zip | |
The default "ldap filter" is (uid=%u), not (&(uid=%u)(objectclass=sambaAccount))
| -rw-r--r-- | docs/Samba-HOWTO-Collection/Passdb.xml | 2 | ||||
| -rw-r--r-- | 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 42742db6bdf..53767e92726 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>(&(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 eba6a76f955..0d2a187e130 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">(&(uid=%u)(objectclass=sambaAccount))</value> +<value type="default">(uid=%u)</value> +<value type="example">(&(uid=%u)(objectclass=sambaSamAccount))</value> </samba:parameter> |