Update of /cvsroot/pdd/Userguide/directives/sgml
In directory vz-cvs-3.sog:/tmp/cvs-serv9985
Modified Files:
LDAPUsers LDAPGroups
Log Message:
better wording, mention that default filters honor LDAPAttr mappings
Index: LDAPGroups
===================================================================
RCS file: /cvsroot/pdd/Userguide/directives/sgml/LDAPGroups,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LDAPGroups 15 Oct 2010 18:20:38 -0000 1.1
+++ LDAPGroups 26 Jun 2012 19:22:29 -0000 1.2
@@ -77,13 +77,12 @@
<para>Activates LDAP group membership lookups and GID to name
mappings in directory listings.</para>
- <para>The first argument to this directive is the LDAP base DN to
- use for group lookups. The second through fourth arguments are
- templates to be used for the search filter; %u will be replaced with
- the group name, GID number, or group member username that is being
- looked up, respectively.</para>
+ <para>The first argument is the LDAP base DN to use for group
+ lookups. The second through fourth arguments are search filter
+ templates; %u will be replaced with the group name, GID number, or
+ group member username that is being looked up, respectively.</para>
- <para>By default, the search filter templates look like this:</para>
+ <para>The default search filter templates are:</para>
<para>
group-name-filter-template: "(&(LDAPAttr_cn=%u)(objectclass=posixGroup))",
gid-number-filter-template: "(&(LDAPAttr_gidNumber=%u)(objectclass=posixGroup))",
@@ -92,7 +91,8 @@
<para>The attribute names used in the default search filters are
taken from the <link linkend="LDAPAttr">LDAPAttr</link>
- directive.</para>
+ directive, so if you re-map an attribute, the default search filter
+ reflects that re-mapping.</para>
</refsect1>
<refsect1>
Index: LDAPUsers
===================================================================
RCS file: /cvsroot/pdd/Userguide/directives/sgml/LDAPUsers,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- LDAPUsers 26 Jun 2012 19:19:18 -0000 1.2
+++ LDAPUsers 26 Jun 2012 19:22:29 -0000 1.3
@@ -77,15 +77,15 @@
useful in "virtual user" environments, since mod_ldap won't be able
to look up other users.</para>
- <para>The second argument is a template to be used for the search
- filter when looking up users by username; %u will be replaced with
- the username that is being authenticated.</para>
+ <para>The second argument is the search filter template for looking
+ up users by username; %u will be replaced with the username that is
+ being authenticated.</para>
- <para>The third argument is a template to be used for the search
- filter when looking up users by UID number; %u will be replaced with
- the UID number that is being looked up.</para>
+ <para>The third argument is the search filter template for looking
+ up users by UID number; %u will be replaced with the UID number that
+ is being looked up.</para>
- <para>By default, the search filter templates look like this:</para>
+ <para>The default search filter templates are:</para>
<para>
username-filter-template: "(&(LDAPAttr_uid=%u)(objectclass=posixAccount))",
uid-number-filter-template: "(&(LDAPAttr_uidNumber=%u)(objectclass=posixAccount))",
@@ -93,7 +93,8 @@
<para>The attribute names used in the default search filters are
taken from the <link linkend="LDAPAttr">LDAPAttr</link>
- directive.</para>
+ directive, so if you re-map an attribute, the default search filter
+ reflects that re-mapping.</para>
</refsect1>
<refsect1>
|