Reduce warnings: Add missing 0 or NULL initializers for struct members.

diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index 8294a6f284a42d222671d6ac1755e33091e48aa3..e5d48f0538d6f374f632cb3998ebb1cc29a0dba7 100644 (file)
--- 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 a3f06eb49c760cdae989aed14cfb63d5d78a6710..53954041adf79081c045dc6daf09b0e798d972be 100644 (file)
--- 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 697ef05c0830dbcee15d7ca1a614a89e91cb2ec9..46bb4c9c65f07a8e4ee6f72a20b5ec6d4ea9c72d 100644 (file)
--- 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 45fe39a95c13143abc949a72fbe75783e3aca74d..35d029b0e39b487f779f9a5b7f45397b9eed47bb 100644 (file)
--- 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 7b44cd6768e06c6566a3165d057a5edb08939ca0..7dabdd416a261a97da7379a2f613cd6f66b674ce 100644 (file)
--- 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 5add2b243caf2e2ed944eebea6045197e3a389d4..a06af9fb6a875ddf2fc9e28c19be5d65ac84113a 100644 (file)
--- 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 = {