ITS#5946

diff --git a/CHANGES b/CHANGES
index c8cac37a974b614798ac64b4550d0f20a67ec12c..a0e95910c743eae0ae1c5445471ee32f237fa1a4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
 OpenLDAP 2.4.18 Engineering
        Fixed liblber speed and other problems (ITS#6215)
        Fixed libldap tls_check_hostname for OpenSSL and MozNSS (ITS#6239)
+       Fixed slapd allow mirrormode to be set to FALSE (ITS#5946)
        Fixed slapd dncachesize behavior to unlimited by default (ITS#6222)
        Fixed slapd incorrectly applying writetimeout when not set (ITS#6220)
        Fixed slapd server URL matching (ITS#5942)

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 6a32e49a45a5bfa375b52aafd76d3b33bf1d60c9..a568a8d4ca973d6945cd227d18bacdffa65184e1 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -1859,7 +1859,7 @@ sortval_reject:
                        break;
 
                case CFG_MIRRORMODE:
-                       if(!SLAP_SHADOW(c->be)) {
+                       if(c->value_int && !SLAP_SHADOW(c->be)) {
                                snprintf( c->cr_msg, sizeof( c->cr_msg ), "<%s> database is not a shadow",
                                        c->argv[0] );
                                Debug(LDAP_DEBUG_ANY, "%s: %s\n",