From 778a38f49cb8f25ffdf3044adadac54c2718d73f Mon Sep 17 00:00:00 2001
From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 29 Apr 2003 16:36:19 +0000
Subject: [PATCH] Reduce warnings: Add missing 0 or NULL initializers for
 struct members.

---
 libraries/liblber/options.c | 2 +-
 libraries/libldap/ftest.c   | 2 +-
 servers/slapd/backglue.c    | 2 +-
 servers/slapd/sasl.c        | 4 ++--
 servers/slapd/saslauthz.c   | 4 ++--
 servers/slapd/schema_prep.c | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index 8294a6f284..e5d48f0538 100644
--- a/libraries/liblber/options.c
+++ b/libraries/liblber/options.c
@@ -11,7 +11,7 @@
 #include "lber-int.h"
 
 struct lber_options ber_int_options = {
-	LBER_UNINITIALIZED, 0, 0 };
+	LBER_UNINITIALIZED, 0, 0, 0 };
 
 int
 ber_get_option(
diff --git a/libraries/libldap/ftest.c b/libraries/libldap/ftest.c
index a3f06eb49c..53954041ad 100644
--- a/libraries/libldap/ftest.c
+++ b/libraries/libldap/ftest.c
@@ -76,7 +76,7 @@ main( int argc, char *argv[] )
 static int filter2ber( char *filter )
 {
 	int rc;
-	struct berval bv = {0};
+	struct berval bv = {0, NULL};
 	BerElement *ber;
 
 	printf( "Filter: %s\n", filter );
diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 697ef05c08..46bb4c9c65 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -244,7 +244,7 @@ glue_back_search ( Operation *op, SlapReply *rs )
 	int i;
 	long stoptime = 0;
 	glue_state gs = {0, 0, NULL, 0, NULL, NULL};
-	slap_callback cb = { glue_back_response };
+	slap_callback cb = { glue_back_response, NULL };
 	int scope0, slimit0, tlimit0;
 	struct berval dn, ndn;
 
diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 45fe39a95c..35d029b0e3 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -422,7 +422,7 @@ slap_auxprop_lookup(
 	}
 
 	if (doit) {
-		slap_callback cb = { sasl_ap_lookup };
+		slap_callback cb = { sasl_ap_lookup, NULL };
 
 		cb.sc_private = &sl;
 
@@ -548,7 +548,7 @@ slap_sasl_checkpass(
 
 	op.o_bd = select_backend( &op.o_req_ndn, 0, 1 );
 	if ( op.o_bd && op.o_bd->be_search ) {
-		slap_callback cb = { sasl_cb_checkpass };
+		slap_callback cb = { sasl_cb_checkpass, NULL };
 		SlapReply rs = {REP_RESULT};
 
 		ci.cred.bv_val = (char *)pass;
diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 7b44cd6768..7dabdd416a 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -389,7 +389,7 @@ int slap_sasl_match(Operation *opx, struct berval *rule, struct berval *assertDN
 	int rc; 
 	regex_t reg;
 	smatch_info sm;
-	slap_callback cb = { sasl_sc_smatch };
+	slap_callback cb = { sasl_sc_smatch, NULL };
 	Operation op = {0};
 	SlapReply rs = {REP_RESULT};
 
@@ -548,7 +548,7 @@ void slap_sasl2dn( Operation *opx,
 	struct berval *saslname, struct berval *sasldn )
 {
 	int rc;
-	slap_callback cb = { sasl_sc_sasl2dn };
+	slap_callback cb = { sasl_sc_sasl2dn, NULL };
 	Operation op = {0};
 	SlapReply rs = {REP_RESULT};
 	struct berval regout = { 0, NULL };
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 5add2b243c..a06af9fb6a 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -770,7 +770,7 @@ static struct slap_schema_ad_map {
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_krbName) },
 #endif
-	{ NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0 }
+	{ NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0 }
 };
 
 static AttributeType slap_at_undefined = {
-- 
2.39.5