From 320c291455fdda1e12fa32e5f59060f3238eccb1 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Sun, 20 Mar 2005 09:50:09 +0000
Subject: [PATCH] Fix config_rootpw

---
 servers/slapd/bconfig.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index fc791ec4d3..63869515a6 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -415,7 +415,7 @@ ConfigTable config_back_cf_table[] = {
 	{ "rootDSE", "file", 2, 2, 0, ARG_MAGIC|CFG_ROOTDSE,
 		&config_generic, "( OLcfgAt:51 NAME 'olcRootDSE' "
 			"SYNTAX OMsDirectoryString )", NULL, NULL },
-	{ "rootpw", "password", 2, 2, 0, ARG_STRING|ARG_DB|ARG_MAGIC,
+	{ "rootpw", "password", 2, 2, 0, ARG_BERVAL|ARG_DB|ARG_MAGIC,
 		&config_rootpw, "( OLcfgAt:52 NAME 'olcRootPW' "
 			"SYNTAX OMsOctetString SINGLE-VALUE )", NULL, NULL },
 	{ "sasl-authz-policy", NULL, 2, 2, 0, ARG_MAGIC|CFG_AZPOLICY,
@@ -1350,7 +1350,7 @@ config_rootpw(ConfigArgs *c) {
 	Backend *tbe;
 	if (c->op == SLAP_CONFIG_EMIT) {
 		if (!BER_BVISEMPTY(&c->be->be_rootpw)) {
-			c->value_string=c->be->be_rootpw.bv_val;
+			ber_dupbv( &c->value_bv, &c->be->be_rootpw);
 			return 0;
 		}
 		return 1;
@@ -1363,7 +1363,7 @@ config_rootpw(ConfigArgs *c) {
 			c->log, 0, 0);
 		return(1);
 	}
-	ber_str2bv(c->value_string, 0, 0, &c->be->be_rootpw);
+	c->be->be_rootpw = c->value_bv;
 	return(0);
 }
 
-- 
2.39.5