From e404a15082d4a1c0219095c56191e5a26de234c8 Mon Sep 17 00:00:00 2001
From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sun, 31 Jul 2005 18:17:13 +0000
Subject: [PATCH] Cleanup

---
 servers/slapd/back-ldif/ldif.c | 2 +-
 servers/slapd/bconfig.c        | 2 +-
 servers/slapd/delete.c         | 2 +-
 servers/slapd/main.c           | 2 +-
 servers/slapd/sasl.c           | 2 +-
 servers/slapd/syncrepl.c       | 6 +++---
 servers/slurpd/ldap_op.c       | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index c9f3fe1ca9..10afd9c8f6 100644
--- a/servers/slapd/back-ldif/ldif.c
+++ b/servers/slapd/back-ldif/ldif.c
@@ -746,7 +746,7 @@ ldif_back_bind( Operation *op, SlapReply *rs )
 static int ldif_back_search(Operation *op, SlapReply *rs)
 {
 	struct ldif_info *ni = (struct ldif_info *) op->o_bd->be_private;
-	enumCookie ck = {0};
+	enumCookie ck = { NULL, NULL, NULL, 0, 0 };
 
 	ck.op = op;
 	ck.rs = rs;
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 2307a8716c..ad55a887da 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -2115,7 +2115,7 @@ replica_unparse( struct slap_replica_info *ri, int i, struct berval *bv )
 {
 	int len;
 	char *ptr;
-	struct berval bc = {0};
+	struct berval bc = BER_BVNULL;
 	char numbuf[32];
 
 	len = sprintf(numbuf, IFMT, i );
diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 722359ae06..51bb8d7902 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -204,7 +204,7 @@ fe_op_delete( Operation *op, SlapReply *rs )
 			{
 				op->o_delete_glue_parent = 0;
 				if ( !be_issuffix( op->o_bd, &op->o_req_ndn )) {
-					slap_callback cb = { NULL };
+					slap_callback cb = { NULL, NULL, NULL, NULL };
 					cb.sc_response = slap_null_cb;
 					dnParent( &op->o_req_ndn, &pdn );
 					op->o_req_dn = pdn;
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 4f0295f2d9..e3b0560f1c 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -181,7 +181,7 @@ struct option_helper {
 	const char	*oh_usage;
 } option_helpers[] = {
 	{ BER_BVC("slp"),	slapd_opt_slp,	NULL, "slp[={on|off}] enable/disable SLP" },
-	{ BER_BVNULL }
+	{ BER_BVNULL, 0, NULL, NULL }
 };
 
 static void
diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 5aac28e25e..385e912c6c 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -147,7 +147,7 @@ slap_sasl_log(
 static const char *slap_propnames[] = {
 	"*slapConn", "*slapAuthcDN", "*slapAuthzDN", NULL };
 
-static Filter generic_filter = { LDAP_FILTER_PRESENT };
+static Filter generic_filter = { LDAP_FILTER_PRESENT, { 0 }, NULL };
 static struct berval generic_filterstr = BER_BVC("(objectclass=*)");
 
 #define	PROP_CONN	0
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 55541c19b7..79e17094fb 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -535,8 +535,8 @@ do_syncrep2(
 
 	int		syncstate;
 	struct berval	syncUUID = BER_BVNULL;
-	struct sync_cookie	syncCookie = { 0 };
-	struct sync_cookie	syncCookie_req = { 0 };
+	struct sync_cookie	syncCookie = { BER_BVNULL };
+	struct sync_cookie	syncCookie_req = { BER_BVNULL };
 	struct berval		cookie = BER_BVNULL;
 
 	int	rc, err, i;
@@ -1205,7 +1205,7 @@ syncrepl_entry(
 	struct berval* syncCSN )
 {
 	Backend *be = op->o_bd;
-	slap_callback	cb = { NULL };
+	slap_callback	cb = { NULL, NULL, NULL, NULL };
 	struct berval	*syncuuid_bv = NULL;
 	struct berval	syncUUID_strrep = BER_BVNULL;
 	struct berval	uuid_bv = BER_BVNULL;
diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index 77cee77f1b..b33a74a49a 100644
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -711,7 +711,7 @@ retry:
     }
 
 	{	/* set version 3 */
-		int err, version = 3;
+		int err, version = LDAP_VERSION3;
 		err = ldap_set_option(ri->ri_ldp,
 			LDAP_OPT_PROTOCOL_VERSION, &version);
 
-- 
2.39.2