Cleanup

diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index c9f3fe1ca9185255ccf4d527f8bca95adebaf4d4..10afd9c8f6718a4c01066fb57a906521e322061f 100644 (file)
--- 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 2307a8716ce276a529fb24d34c462107a887ba69..ad55a887daec969c4c30c19ab05481988729fd11 100644 (file)
--- 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 722359ae06e9b99979f80249c9ce8475ef45047e..51bb8d7902d706a95343559cad1285413d9c143e 100644 (file)
--- 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 4f0295f2d9e8634b020428f7db43bd0f53de31c4..e3b0560f1c01b360c6b7347ff80fbaea05dc6e01 100644 (file)
--- 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 5aac28e25ef01ef0fc8af6d02ca0709a7146eff2..385e912c6c5c26fd901c1c75a78ae4395dcb26c8 100644 (file)
--- 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 55541c19b7989951f2e7e445badd10336a74f176..79e17094fbc8c0115527c758a83e552fb79f0561 100644 (file)
--- 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 77cee77f1bf8fd5ea9fca830b0243e96f25015b3..b33a74a49a7dce79310d88a7ab29a08e4d14a8c4 100644 (file)
--- 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);