On Tue, Sep 17, 2013 at 02:09:08PM +0200, Pavel Březina wrote: > On 09/16/2013 05:22 PM, Jakub Hrozek wrote: > >I found these minor issues in our man pages, when triaging support > >issues with Red Hat GSS earlier today. > > > >The first patch changes the subtitle of the man pages. I wasn't > >completely sure if the title is set to "SSSD config file" on purpose > >(after all they do describe the config file, just per-provider), but I > >think that at least the Kerberos locator man page should be fixed. > > > >The second patch fixes indentation of programlisting. The programlisting > >element makes the text in the element formatted verbatim, so it would > >have appeared too much to the right. > > Patch 1 Ack > Patch 2 Nack > > The listing is still to far to the right in comparison to other > listings. There should be no spaces in the source file. > > However, since ldap_user_search_filter is deprecated for few > versions already, cannot we remove it from master? >
I'm not sure if we can remove it right away, but we can start printing a deprecation warning and remove it from docs, I think. The new search bases have been around sine 1.7.0, so I think deprecating the old way in 1.12 is OK.
>From f56a3c19ce64891dfe387a07382a0543c41c6f21 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek <[email protected]> Date: Thu, 12 Sep 2013 19:43:05 +0200 Subject: [PATCH 1/2] MAN: Fix provider man page subtitle --- src/man/sssd-ad.5.xml | 2 +- src/man/sssd-ipa.5.xml | 2 +- src/man/sssd-krb5.5.xml | 2 +- src/man/sssd-ldap.5.xml | 2 +- src/man/sssd_krb5_locator_plugin.8.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/man/sssd-ad.5.xml b/src/man/sssd-ad.5.xml index 4a8c60b49e4ac30788d1f07b50ea05274d1686e5..ce5602b8c1b4a629412ba2ce45a229c48f392bf6 100644 --- a/src/man/sssd-ad.5.xml +++ b/src/man/sssd-ad.5.xml @@ -14,7 +14,7 @@ <refnamediv id='name'> <refname>sssd-ad</refname> - <refpurpose>the configuration file for SSSD</refpurpose> + <refpurpose>SSSD Active Directory provider</refpurpose> </refnamediv> <refsect1 id='description'> diff --git a/src/man/sssd-ipa.5.xml b/src/man/sssd-ipa.5.xml index 667920edcaad07caff63bf872a74b322c5fba437..7b0c7be893fd21bcb9b208363716cbb74c1aa27e 100644 --- a/src/man/sssd-ipa.5.xml +++ b/src/man/sssd-ipa.5.xml @@ -14,7 +14,7 @@ <refnamediv id='name'> <refname>sssd-ipa</refname> - <refpurpose>the configuration file for SSSD</refpurpose> + <refpurpose>SSSD IPA provider</refpurpose> </refnamediv> <refsect1 id='description'> diff --git a/src/man/sssd-krb5.5.xml b/src/man/sssd-krb5.5.xml index 9b0bfba42c50ba1b52222ce27c19098c798e81f1..d1ff0196ce0e3b0a9050f90fd8a6691d96d375ad 100644 --- a/src/man/sssd-krb5.5.xml +++ b/src/man/sssd-krb5.5.xml @@ -14,7 +14,7 @@ <refnamediv id='name'> <refname>sssd-krb5</refname> - <refpurpose>the configuration file for SSSD</refpurpose> + <refpurpose>SSSD Kerberos provider</refpurpose> </refnamediv> <refsect1 id='description'> diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index 12e9152475070c53953649def3697ecc25f7d6db..d488ab37a774c45e62555c2cfb5d5be980e7775b 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -14,7 +14,7 @@ <refnamediv id='name'> <refname>sssd-ldap</refname> - <refpurpose>the configuration file for SSSD</refpurpose> + <refpurpose>SSSD LDAP provider</refpurpose> </refnamediv> <refsect1 id='description'> diff --git a/src/man/sssd_krb5_locator_plugin.8.xml b/src/man/sssd_krb5_locator_plugin.8.xml index ab28e12e25a7d1fdce06f8533cc6e41d99c11a13..25a20c88fcd4c2b3f644da24b34a4d5e9eb80ed3 100644 --- a/src/man/sssd_krb5_locator_plugin.8.xml +++ b/src/man/sssd_krb5_locator_plugin.8.xml @@ -13,7 +13,7 @@ <refnamediv id='name'> <refname>sssd_krb5_locator_plugin</refname> - <refpurpose>the configuration file for SSSD</refpurpose> + <refpurpose>Kerberos locator plugin</refpurpose> </refnamediv> <refsect1 id='description'> -- 1.8.3.1
>From 643978c05fe10fa538497d37a8b9e290789c3f59 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek <[email protected]> Date: Mon, 16 Sep 2013 13:52:54 +0200 Subject: [PATCH 2/2] LDAP: Deprecate ldap_{user,group}_search_filter --- src/man/sssd-ldap.5.xml | 44 ---------------------------------------- src/providers/ldap/ldap_common.c | 12 +++++++++++ 2 files changed, 12 insertions(+), 44 deletions(-) diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml index d488ab37a774c45e62555c2cfb5d5be980e7775b..8e6a4a3942bc0ae82f1b356a5b05f948d2f06f5c 100644 --- a/src/man/sssd-ldap.5.xml +++ b/src/man/sssd-ldap.5.xml @@ -2331,50 +2331,6 @@ ldap_access_filter = memberOf=cn=allowedusers,ou=Groups,dc=example,dc=com <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="include/ldap_search_bases.xml" /> </varlistentry> - <varlistentry> - <term>ldap_user_search_filter (string)</term> - <listitem> - <para> - This option specifies an additional LDAP search - filter criteria that restrict user searches. - </para> - <para> - This option is <emphasis>deprecated</emphasis> in - favor of the syntax used by ldap_user_search_base. - </para> - <para> - Default: not set - </para> - <para> - Example: - </para> - <programlisting> - ldap_user_search_filter = (loginShell=/bin/tcsh) - </programlisting> - <para> - This filter would restrict user searches to users - that have their shell set to /bin/tcsh. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term>ldap_group_search_filter (string)</term> - <listitem> - <para> - This option specifies an additional LDAP search - filter criteria that restrict group searches. - </para> - <para> - This option is <emphasis>deprecated</emphasis> in - favor of the syntax used by ldap_group_search_base. - </para> - <para> - Default: not set - </para> - </listitem> - </varlistentry> - <varlistentry condition="with_sudo"> <term>ldap_sudo_search_base (string)</term> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="include/ldap_search_bases.xml" /> diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index b668a48e33ab9791be73d4788e28b27d5822255b..d649e33320f7162226f36eeafac5488e5372c05c 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -792,6 +792,18 @@ errno_t common_parse_search_base(TALLOC_CTX *mem_ctx, goto done; } + if (old_filter != NULL) { + /* Using a deprecated ldap_{user,group}_search_filter */ + DEBUG(SSSDBG_IMPORTANT_INFO, ("WARNING: Using a deprecated filter " + "option for %s. Please see the documentation on LDAP search " + "bases to see how the obsolete option can be migrated\n", + class_name)); + sss_log(SSS_LOG_NOTICE, "WARNING: Using a deprecated filter option" + "for %s. Please see the documentation on LDAP search bases " + "to see how the obsolete option can be migrated\n", + class_name); + } + ret = sdap_create_search_base(search_bases, unparsed_base, LDAP_SCOPE_SUBTREE, old_filter, &search_bases[0]); -- 1.8.3.1
_______________________________________________ sssd-devel mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
