From: Hallvard Furuseth <hallvard@openldap.org>
Date: Fri, 3 Dec 2010 10:08:59 +0000 (+0000)
Subject: Fix rev 1.132 (ITS#6632): Initialize all of roc in rwm_callback_get()
X-Git-Tag: MIGRATION_CVS2GIT~385
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6be36719852c9990b2e0cdb4ba25dc8d765c2b8f;p=openldap

Fix rev 1.132 (ITS#6632): Initialize all of roc in rwm_callback_get()
---

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index a0fd0316fe..4fe78e6e8b 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -174,7 +174,7 @@ rwm_op_cleanup( Operation *op, SlapReply *rs )
 static rwm_op_cb *
 rwm_callback_get( Operation *op, SlapReply *rs )
 {
-	rwm_op_cb	*roc = NULL;
+	rwm_op_cb	*roc;
 
 	roc = op->o_tmpalloc( sizeof( struct rwm_op_cb ), op->o_tmpmemctx );
 	roc->cb.sc_cleanup = rwm_op_cleanup;
@@ -184,9 +184,12 @@ rwm_callback_get( Operation *op, SlapReply *rs )
 	roc->ros.r_tag = op->o_tag;
 	roc->ros.ro_dn = op->o_req_dn;
 	roc->ros.ro_ndn = op->o_req_ndn;
-	roc->ros.o_request = op->o_request;
 	BER_BVZERO( &roc->ros.r_dn );
 	BER_BVZERO( &roc->ros.r_ndn );
+	BER_BVZERO( &roc->ros.rx_dn );
+	BER_BVZERO( &roc->ros.rx_ndn );
+	roc->ros.mapped_attrs = NULL;
+	roc->ros.o_request = op->o_request;
 
 	return roc;
 }