Fixed default parameter value and description for ldap_autofs_entry_object_class --- src/man/sssd-ldap.5.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index f140908..3436f9e 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -2493,11 +2493,12 @@ ldap_access_filter = (employeeType=admin) <term>ldap_autofs_entry_object_class (string)</term> <listitem> <para> - The object class of an automount map entry - in LDAP. + The object class of an automount entry + in LDAP. The entry usually corresponds to a mount + point. </para> <para> - Default: automountMap + Default: automount </para> </listitem> </varlistentry>
On Tue, Jul 07, 2015 at 01:00:37AM +0100, Robin McCorkell wrote:
Fixed default parameter value and description for ldap_autofs_entry_object_class
src/man/sssd-ldap.5.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index f140908..3436f9e 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -2493,11 +2493,12 @@ ldap_access_filter = (employeeType=admin) <term>ldap_autofs_entry_object_class (string)</term> <listitem> <para>
The object class of an automount map entryin LDAP.
The object class of an automount entryin LDAP. The entry usually corresponds to a mountpoint. </para> <para>
Default: automountMap
Default: automount </para> </listitem> </varlistentry>-- 2.4.5
Thank you, this patch is correct and I'm fine with commiting it as-is, but looking at the options, I also wonder if we should document them better per-schema?
For instance, the ldap_autofs_map_name defaults to "ou" if schema is set to rfc2307 but defaults to "automountMapName" with rfc2307bis. And IIRC the bis schema is what most autofs deployments use, so we might save some remapping for bis configs...
ldap_autofs_map_name and ldap_autofs_entry_key have their rfc2307bis defaults listed alongside the rfc2307 defaults.
ldap_autofs_entry_object_class has a fixed description and default
This patch replaces the other one I posted, implementing the alternative schema defaults Jakub suggested.
Regards, Robin McCorkell
--- src/man/sssd-ldap.5.xml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index f140908..2f9a950 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -2445,8 +2445,8 @@ ldap_access_filter = (employeeType=admin) <refsect1 id='autofs-options' condition="with_autofs"> <title>AUTOFS OPTIONS</title> <para> - Please note that the default values correspond to the default - schema which is RFC2307. + Some of the defaults for the parameters below are dependent on the + LDAP schema. </para> <para> <variablelist> @@ -2483,7 +2483,8 @@ ldap_access_filter = (employeeType=admin) The name of an automount map entry in LDAP. </para> <para> - Default: ou + Default: ou (rfc2307), automountMapName + (rfc2307bis, ipa, ad) </para> </listitem> </varlistentry> @@ -2493,11 +2494,12 @@ ldap_access_filter = (employeeType=admin) <term>ldap_autofs_entry_object_class (string)</term> <listitem> <para> - The object class of an automount map entry - in LDAP. + The object class of an automount entry + in LDAP. The entry usually corresponds to a mount + point. </para> <para> - Default: automountMap + Default: automount </para> </listitem> </varlistentry> @@ -2511,7 +2513,8 @@ ldap_access_filter = (employeeType=admin) entry usually corresponds to a mount point. </para> <para> - Default: cn + Default: cn (rfc2307), automountKey (rfc2307bis, + ipa, ad) </para> </listitem> </varlistentry>
On Tue, Jul 07, 2015 at 08:41:48AM +0100, Robin McCorkell wrote:
ldap_autofs_map_name and ldap_autofs_entry_key have their rfc2307bis defaults listed alongside the rfc2307 defaults.
ldap_autofs_entry_object_class has a fixed description and default
This patch replaces the other one I posted, implementing the alternative schema defaults Jakub suggested.
Regards, Robin McCorkell
Thank you and sorry about the delay in review. The information is now correct for all schemas, except ldap_schema=ad
For ldap_schema=ad, the following defaults are used: ldap_autofs_map_object_class = nisMap ldap_autofs_map_name = nisMapName
ldap_autofs_entry_object_class = nisObject ldap_autofs_entry_key = cn ldap_autofs_entry_value = nisMapEntry
If you amend these, I'll ack and push :)
Are you sure? That's not what the code in providers/ldap/ldap_options.c says: https://git.fedorahosted.org/cgit/sssd.git/tree/src/providers/ldap/ldap_opti... I found the autofs attribute maps in providers/ad/ad_opts.h, but they don't seem to be connected to anything, and besides, they only activate when the AD provider is enabled, not when the AD LDAP schema is enabled but the LDAP provider is in use (I think).
On 17/07/2015 10:33 AM, Jakub Hrozek wrote:
On Tue, Jul 07, 2015 at 08:41:48AM +0100, Robin McCorkell wrote:
ldap_autofs_map_name and ldap_autofs_entry_key have their rfc2307bis defaults listed alongside the rfc2307 defaults.
ldap_autofs_entry_object_class has a fixed description and default
This patch replaces the other one I posted, implementing the alternative schema defaults Jakub suggested.
Regards, Robin McCorkell
Thank you and sorry about the delay in review. The information is now correct for all schemas, except ldap_schema=ad
For ldap_schema=ad, the following defaults are used: ldap_autofs_map_object_class = nisMap ldap_autofs_map_name = nisMapName
ldap_autofs_entry_object_class = nisObject ldap_autofs_entry_key = cn ldap_autofs_entry_value = nisMapEntry
If you amend these, I'll ack and push :)
On Fri, Jul 17, 2015 at 12:33:45PM +0100, Robin McCorkell wrote:
Are you sure?
You are right and I was wrong, sorry. I based my comment on the contents of src/providers/ad/ad_opts.h where the nis* values are defined. But only now I've actually tested the AD provider and I see that the constants are only defined but never used. We should fix that along with fixing: https://fedorahosted.org/sssd/ticket/1632
That's not what the code in providers/ldap/ldap_options.c says: https://git.fedorahosted.org/cgit/sssd.git/tree/src/providers/ldap/ldap_opti... I found the autofs attribute maps in providers/ad/ad_opts.h, but they don't seem to be connected to anything, and besides, they only activate when the AD provider is enabled,
The AD provider internally sets it ldap_schema value to be 'ad', so using id_provider=ldap with ldap_schema=ad should be equivalent (attribute-mapping-wise) to using id_provider=ad
not when the AD LDAP schema is enabled but the LDAP provider is in use (I think).
ACK to your patch.
On Mon, Jul 20, 2015 at 10:32:17AM +0200, Jakub Hrozek wrote:
On Fri, Jul 17, 2015 at 12:33:45PM +0100, Robin McCorkell wrote:
Are you sure?
You are right and I was wrong, sorry. I based my comment on the contents of src/providers/ad/ad_opts.h where the nis* values are defined. But only now I've actually tested the AD provider and I see that the constants are only defined but never used. We should fix that along with fixing: https://fedorahosted.org/sssd/ticket/1632
That's not what the code in providers/ldap/ldap_options.c says: https://git.fedorahosted.org/cgit/sssd.git/tree/src/providers/ldap/ldap_opti... I found the autofs attribute maps in providers/ad/ad_opts.h, but they don't seem to be connected to anything, and besides, they only activate when the AD provider is enabled,
The AD provider internally sets it ldap_schema value to be 'ad', so using id_provider=ldap with ldap_schema=ad should be equivalent (attribute-mapping-wise) to using id_provider=ad
not when the AD LDAP schema is enabled but the LDAP provider is in use (I think).
ACK to your patch.
* master: e6b6719ec159d3a4c1f82a59489fb9daa26416c2
sssd-devel@lists.fedorahosted.org
-
Jakub Hrozek -
Robin McCorkell