import fix to ITS#4715 from HEAD

diff --git a/CHANGES b/CHANGES
index a24bb4b817147a70ae4d2ba7a6bf40abe263a16e..4c6d03f1e3b913da845cc7d9de762ac43410bbf3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.29 Engineering
        Documentation
+               Fixed slapd-ldap/meta(5) rebind-as-user usage (ITS#4715)
                Fixed slapd-ldap/meta(5) missing network-timeout (ITS#4718)
 
 OpenLDAP 2.3.28 Release

diff --git a/doc/man/man5/slapd-ldap.5 b/doc/man/man5/slapd-ldap.5
index fa1edc7d9848fba41a26dd3f9b940d6d7a37e106..46952f1c213961a1e5be3ebcb119a16aefa6f28b 100644 (file)
--- a/doc/man/man5/slapd-ldap.5
+++ b/doc/man/man5/slapd-ldap.5
@@ -335,8 +335,11 @@ in conjunction with Proxy Authorization.
 .TP
 .B rebind-as-user {NO|yes}
 If this option is given, the client's bind credentials are remembered
-for rebinds when chasing referrals.  Useful when
-\fBchase-referrals\fP is set to \fByes\fP, useless otherwise.
+for rebinds, when trying to re-establish a broken connection,
+or when chasing a referral, if 
+.B chase-referrals
+is set to
+.IR yes .
 
 .TP
 .B t-f-support {NO|yes|discover}

diff --git a/doc/man/man5/slapd-meta.5 b/doc/man/man5/slapd-meta.5
index 82cb4f32d87d9b8cea328c761239def5480c7c10..7b3af28bbbc3c1b652f4d7f5d016be056e8fbe29 100644 (file)
--- a/doc/man/man5/slapd-meta.5
+++ b/doc/man/man5/slapd-meta.5
@@ -146,7 +146,11 @@ identity to be deferred until actually needed by subsequent operations.
 .TP
 .B rebind-as-user {NO|yes}
 If this option is given, the client's bind credentials are remembered
-for rebinds when chasing referrals.
+for rebinds, when trying to re-establish a broken connection,
+or when chasing a referral, if 
+.B chase-referrals
+is set to
+.IR yes .
 
 .SH TARGET SPECIFICATION
 Target specification starts with a "uri" directive: