From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Sun, 2 Aug 2009 23:31:35 +0000 (+0000)
Subject: ITS#5946
X-Git-Tag: OPENLDAP_REL_ENG_2_4_18~81
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c84baeec3e735eb1d3e2ca9151f94a4ad7e9931;p=openldap

ITS#5946
---

diff --git a/CHANGES b/CHANGES
index c8cac37a97..a0e95910c7 100644
--- 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 6a32e49a45..a568a8d4ca 100644
--- 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",