On Tue, Sep 24, 2013 at 03:07:39PM +0200, Jakub Hrozek wrote:
On Tue, Sep 24, 2013 at 02:35:59PM +0200, Pavel Březina wrote:
> On 09/22/2013 11:55 AM, Jakub Hrozek wrote:
> >On Fri, Sep 20, 2013 at 12:54:28PM +0200, Pavel Březina wrote:
> >>https://fedorahosted.org/sssd/ticket/2091
> >
> >> From 1cfaa9fb38d5a8bf0575b0bbe40a65450f39234a Mon Sep 17 00:00:00 2001
> >>From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina(a)redhat.com>
> >>Date: Fri, 20 Sep 2013 12:52:49 +0200
> >>Subject: [PATCH] man: server side password policies always takes precedence
> >>
> >>https://fedorahosted.org/sssd/ticket/2091
> >>---
> >> src/man/sssd-ldap.5.xml | 5 +++++
> >> 1 file changed, 5 insertions(+)
> >>
> >>diff --git a/src/man/sssd-ldap.5.xml b/src/man/sssd-ldap.5.xml
> >>index
12e9152475070c53953649def3697ecc25f7d6db..63dc5806b5aa810a0bd2ebacbd51859cbb42b792 100644
> >>--- a/src/man/sssd-ldap.5.xml
> >>+++ b/src/man/sssd-ldap.5.xml
> >>@@ -1665,6 +1665,11 @@
> >> <para>
> >> Default: none
> >> </para>
> >>+ <para>
> >>+ <emphasis>Note</emphasis>: if a
password policy
> >>+ is configured on server side, it always takes
> >>+ precedence over policy set in this option.
> > I'd say "with this
> > option". otherwise ack
> >>+ </para>
> >> </listitem>
> >> </varlistentry>
> >>
> >>--
> >>1.7.11.7
>
> Thanks for the review. New patch is attached.
>
ACK.
Pushed to master and sssd-1-11.