use BER_BVNULL

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index e5db4a6cfd4f4f34d2ccec6d2c00eb03c418d1ec..754e9539bf780ce309c1f4fa65bb93bc96c8df20 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -1207,7 +1207,7 @@ dn_match_cleanup:;
 
                if ( b->a_group_pat.bv_len ) {
                        struct berval bv;
-                       struct berval ndn = { 0, NULL };
+                       struct berval ndn = BER_BVNULL;
                        int rc;
 
                        if ( op->o_ndn.bv_len == 0 ) {
@@ -1763,14 +1763,14 @@ aci_match_set (
        int setref
 )
 {
-       struct berval set = { 0, NULL };
+       struct berval set = BER_BVNULL;
        int rc = 0;
        AciSetCookie cookie;
 
        if (setref == 0) {
                ber_dupbv_x( &set, subj, op->o_tmpmemctx );
        } else {
-               struct berval subjdn, ndn = { 0, NULL };
+               struct berval subjdn, ndn = BER_BVNULL;
                struct berval setat;
                BerVarray bvals;
                const char *text;

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 61dda94b37ae62207041095f3b78e03cd26ec6a3..b21fab1ff666a06c0d9250df0790061d9ac2a8d6 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -1875,7 +1875,7 @@ print_acl( Backend *be, AccessControl *a )
        }
 
        if ( a->acl_filter != NULL ) {
-               struct berval bv = { 0, NULL };
+               struct berval bv = BER_BVNULL;
                to++;
                filter2bv( a->acl_filter, &bv );
                fprintf( stderr, " filter=%s\n", bv.bv_val );

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index ffa94168b67ed0e6573c5bd4c6e1fe5986c8c817..ebb06d69afaa8936c9a5822895a97198b5a87b80 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -46,7 +46,7 @@ do_add( Operation *op, SlapReply *rs )
 {
        BerElement      *ber = op->o_ber;
        char            *last;
-       struct berval dn = { 0, NULL };
+       struct berval dn = BER_BVNULL;
        ber_len_t       len;
        ber_tag_t       tag;
        Entry           *e;

diff --git a/servers/slapd/back-bdb/ctxcsn.c b/servers/slapd/back-bdb/ctxcsn.c
index 104ed0d86c70ff622e909c3f6fa99410c764b878..d95989caf083f51102df9757d3c0644ee367bbab 100644 (file)
--- a/servers/slapd/back-bdb/ctxcsn.c
+++ b/servers/slapd/back-bdb/ctxcsn.c
@@ -39,7 +39,7 @@ bdb_csn_commit(
 )
 {
        struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
-       struct berval   ctxcsn_ndn = { 0, NULL };
+       struct berval   ctxcsn_ndn = BER_BVNULL;
        EntryInfo               *ctxcsn_ei = NULL;
        DB_LOCK                 ctxcsn_lock;
        struct berval   max_committed_csn;

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index cd9d9a7c26ccd464fd44960fecb42320065b2535..86a95559d0ea8408e5e6ea28d897a4f4301a5401 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -36,7 +36,7 @@ static const struct bdbi_database {
        { NULL, NULL, 0, 0 }
 };
 
-struct berval bdb_uuid = { 0, NULL };
+struct berval bdb_uuid = BER_BVNULL;
 
 typedef void * db_malloc(size_t);
 typedef void * db_realloc(void *, size_t);

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 97da998b23738305878c64e7bafafba8263c3035..34c4abe7e0c7ddca412208cbc9a2bd089f3a6cb1 100644 (file)
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -376,7 +376,7 @@ bdb_do_search( Operation *op, SlapReply *rs, Operation *sop,
        Entry           *e = NULL, base;
        Entry   *matched = NULL;
        EntryInfo       *ei;
-       struct berval   realbase = { 0, NULL };
+       struct berval   realbase = BER_BVNULL;
        int             manageDSAit;
        int             tentries = 0;
        ID              lastid = NOID;
@@ -558,7 +558,7 @@ dn2entry_retry:
        }
 
        if ( e == NULL ) {
-               struct berval matched_dn = { 0, NULL };
+               struct berval matched_dn = BER_BVNULL;
 
                if ( matched != NULL ) {
                        BerVarray erefs;
@@ -1674,7 +1674,7 @@ send_pagerequest_response(
        LDAPControl     ctrl, *ctrls[2];
        BerElementBuffer berbuf;
        BerElement      *ber = (BerElement *)&berbuf;
-       struct berval   cookie = { 0, NULL };
+       struct berval   cookie = BER_BVNULL;
        PagedResultsCookie respcookie;
 
 #ifdef NEW_LOGGING

diff --git a/servers/slapd/back-dnssrv/search.c b/servers/slapd/back-dnssrv/search.c
index 09954e13b323faa40a68041f0135e52e58d56b06..cac168ad1aec1e2bba202f84e4fb2b901d9c76f9 100644 (file)
--- a/servers/slapd/back-dnssrv/search.c
+++ b/servers/slapd/back-dnssrv/search.c
@@ -41,7 +41,7 @@ dnssrv_back_search(
        char *hostlist = NULL;
        char **hosts = NULL;
        char *refdn;
-       struct berval nrefdn = { 0, NULL };
+       struct berval nrefdn = BER_BVNULL;
        BerVarray urls = NULL;
        int manageDSAit;
 

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index 53e29906e62ea01e48d2e594990802efb2699a79..72c40f0b51ff29504bbcce59800276328c469195 100644 (file)
--- a/servers/slapd/back-ldap/add.c
+++ b/servers/slapd/back-ldap/add.c
@@ -42,7 +42,7 @@ ldap_back_add(
        Attribute *a;
        LDAPMod **attrs;
        struct berval mapped;
-       struct berval mdn = { 0, NULL };
+       struct berval mdn = BER_BVNULL;
        ber_int_t msgid;
        dncookie dc;
        int isupdate;

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 26aa3fe5b552cecb89fcf5b1a05cb45c0327e89f..41580063e659fbf9832ab68b09cb3cfd8f640cfd 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -45,7 +45,7 @@ ldap_back_bind(
        struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
        struct ldapconn *lc;
 
-       struct berval mdn = { 0, NULL };
+       struct berval mdn = BER_BVNULL;
        int rc = 0;
        ber_int_t msgid;
        dncookie dc;

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index 8af11742f5d3ccdb5642964ccc4953ab0761376a..f8d04d71ce6214a7735642b1529f440926fe7cbc 100644 (file)
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -38,8 +38,8 @@ ldap_back_compare(
 {
        struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
        struct ldapconn *lc;
-       struct berval mapped_at = { 0, NULL }, mapped_val = { 0, NULL };
-       struct berval mdn = { 0, NULL };
+       struct berval mapped_at = BER_BVNULL, mapped_val = BER_BVNULL;
+       struct berval mdn = BER_BVNULL;
        ber_int_t msgid;
        int freeval = 0;
        dncookie dc;

diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index 91a7b53f2c5ae92a74babad98640991c562b8801..f7837f45f42080f63fe7b85141f76608d83dc9a7 100644 (file)
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -45,7 +45,7 @@ ldap_back_delete(
        int rc = LDAP_SUCCESS;
 #endif /* LDAP_BACK_PROXY_AUTHZ */
 
-       struct berval mdn = { 0, NULL };
+       struct berval mdn = BER_BVNULL;
 
        lc = ldap_back_getconn( op, rs );
        

diff --git a/servers/slapd/back-ldap/extended.c b/servers/slapd/back-ldap/extended.c
index 9e0641209ffff3a015ab0631c9c52697128f4056..6f35c898a2cbfb613ef298eab16f6cab2e4f2230 100644 (file)
--- a/servers/slapd/back-ldap/extended.c
+++ b/servers/slapd/back-ldap/extended.c
@@ -96,7 +96,7 @@ ldap_back_exop_passwd(
        struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
        struct ldapconn *lc;
        req_pwdexop_s *qpw = &op->oq_pwdexop;
-       struct berval mdn = { 0, NULL }, newpw;
+       struct berval mdn = BER_BVNULL, newpw;
        LDAPMessage *res;
        ber_int_t msgid;
        int rc, isproxy;

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index b40664261fb7da98fcd11a49a7acc7abb30a2499..6f1ccd169cce9de96e73b0343e6df80bd9440abb 100644 (file)
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -43,7 +43,7 @@ ldap_back_modify(
        Modifications *ml;
        int i, j, rc;
        struct berval mapped;
-       struct berval mdn = { 0, NULL };
+       struct berval mdn = BER_BVNULL;
        ber_int_t msgid;
        dncookie dc;
        int isupdate;

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index a479131c86034cdca21a9890a27bfd22070b3e90..5a75d9d4b464fbfde4472fa1b1b58042730a2209 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -45,7 +45,7 @@ ldap_back_modrdn(
        int rc = LDAP_SUCCESS;
 #endif /* LDAP_BACK_PROXY_AUTHZ */
 
-       struct berval mdn = { 0, NULL }, mnewSuperior = { 0, NULL };
+       struct berval mdn = BER_BVNULL, mnewSuperior = BER_BVNULL;
 
        lc = ldap_back_getconn( op, rs );
        if ( !lc || !ldap_back_dobind(lc, op, rs) ) {

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index b0d137cb0e8b77197bae5050ebb8ad7def400137..a6528639970941b0e0eebf30b6324365c181b6c6 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -42,7 +42,7 @@ ldap_build_entry( Operation *op, LDAPMessage *e, Entry *ent,
 #define LDAP_BUILD_ENTRY_PRIVATE       0x01
 #define LDAP_BUILD_ENTRY_NORMALIZE     0x02
 
-static struct berval dummy = { 0, NULL };
+static struct berval dummy = BER_BVNULL;
 
 int
 ldap_back_search(
@@ -54,10 +54,10 @@ ldap_back_search(
        struct timeval  tv;
        LDAPMessage             *res, *e;
        int     rc = 0, msgid; 
-       struct berval match = { 0, NULL };
+       struct berval match = BER_BVNULL;
        char **mapped_attrs = NULL;
        struct berval mbase;
-       struct berval mfilter = { 0, NULL };
+       struct berval mfilter = BER_BVNULL;
        int dontfreetext = 0;
        dncookie dc;
 #ifdef LDAP_BACK_PROXY_AUTHZ
@@ -532,7 +532,7 @@ ldap_back_entry_get(
        struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;    
        struct ldapconn *lc;
        int rc = 1, is_oc;
-       struct berval mapped = { 0, NULL }, bdn, mdn;
+       struct berval mapped = BER_BVNULL, bdn, mdn;
        LDAPMessage     *result = NULL, *e = NULL;
        char *gattr[3];
        char *filter = NULL;

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index 9a404409cad16ca88972cfeee34914c4032cd7d0..d0a7c791c42a84e5883e06312c19d4db9db59fd9 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -42,8 +42,8 @@ ldbm_back_modrdn(
        AttributeDescription *entry = slap_schema.si_ad_entry;
        struct ldbminfo *li = (struct ldbminfo *) op->o_bd->be_private;
        struct berval   p_dn, p_ndn;
-       struct berval   new_dn = { 0, NULL}, new_ndn = { 0, NULL };
-       struct berval   old_ndn = { 0, NULL };
+       struct berval   new_dn = BER_BVNULL, new_ndn = BER_BVNULL;
+       struct berval   old_ndn = BER_BVNULL;
        Entry           *e, *p = NULL;
        Entry           *matched;
        /* LDAP v2 supporting correct attribute handling. */

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index acebe63641c2d0c826fe6a18b98bacfb8e951288..4db79f7740ae3a97f74842abbca00a704d0cf2a1 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -46,7 +46,7 @@ ldbm_back_search(
        ID              id, cursor;
        Entry           *e;
        Entry   *matched = NULL;
-       struct berval   realbase = { 0, NULL };
+       struct berval   realbase = BER_BVNULL;
        int             manageDSAit = get_manageDSAit( op );
 
 #ifdef NEW_LOGGING
@@ -86,7 +86,7 @@ ldbm_back_search(
        }
 
        if ( e == NULL ) {
-               struct berval matched_dn = { 0, NULL };
+               struct berval matched_dn = BER_BVNULL;
 
                if ( matched != NULL ) {
                        BerVarray erefs;

diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index a65a38081212ac6d18f2cd71c96d01abe9dcee44..02ef16770d8906d2b19b281f83651f0a907e1bb4 100644 (file)
--- a/servers/slapd/back-meta/add.c
+++ b/servers/slapd/back-meta/add.c
@@ -40,7 +40,7 @@ meta_back_add( Operation *op, SlapReply *rs )
        int i, candidate = -1;
        Attribute *a;
        LDAPMod **attrs;
-       struct berval mdn = { 0, NULL }, mapped;
+       struct berval mdn = BER_BVNULL, mapped;
        dncookie dc;
 
 #ifdef NEW_LOGGING

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index a62977520e03a89246f866eea6cf4f403cfe1248..d828ff0a62652fbd7eaac6db77c64d1f3e5e6f03 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -191,7 +191,7 @@ meta_back_do_single_bind(
 )
 {
        struct metainfo *li = ( struct metainfo * )op->o_bd->be_private;
-       struct berval   mdn = { 0, NULL };
+       struct berval   mdn = BER_BVNULL;
        ber_int_t       msgid;
        dncookie        dc;
        struct metasingleconn   *lsc = &lc->conns[ candidate ];

diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index da20763aab9879f1cf880fc0e1dd1ef0007ad74f..f5468c244994582b7d49db45275f2a52ee51084f 100644 (file)
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -38,7 +38,7 @@ meta_back_compare( Operation *op, SlapReply *rs )
        struct metaconn *lc;
        struct metasingleconn *lsc;
        char *match = NULL, *err = NULL;
-       struct berval mmatch = { 0, NULL };
+       struct berval mmatch = BER_BVNULL;
        int candidates = 0, last = 0, i, count = 0, rc;
                int cres = LDAP_SUCCESS, rres = LDAP_SUCCESS;
        int *msgid;
@@ -70,7 +70,7 @@ meta_back_compare( Operation *op, SlapReply *rs )
        dc.ctx = "compareDN";
 
        for ( i = 0, lsc = lc->conns; !META_LAST(lsc); ++i, ++lsc ) {
-               struct berval mdn = { 0, NULL };
+               struct berval mdn = BER_BVNULL;
                struct berval mapped_attr = op->oq_compare.rs_ava->aa_desc->ad_cname;
                struct berval mapped_value = op->oq_compare.rs_ava->aa_value;
 

diff --git a/servers/slapd/back-meta/delete.c b/servers/slapd/back-meta/delete.c
index c3c8ea8f5ff02f42d6e68521843b68b4ec743a9d..18973f0c28d5159ce233d7700b61cbc870deb05b 100644 (file)
--- a/servers/slapd/back-meta/delete.c
+++ b/servers/slapd/back-meta/delete.c
@@ -37,7 +37,7 @@ meta_back_delete( Operation *op, SlapReply *rs )
        struct metainfo *li = ( struct metainfo * )op->o_bd->be_private;
        struct metaconn *lc;
        int candidate = -1;
-       struct berval mdn = { 0, NULL };
+       struct berval mdn = BER_BVNULL;
        dncookie dc;
 
        lc = meta_back_getconn( op, rs, META_OP_REQUIRE_SINGLE,

diff --git a/servers/slapd/back-meta/group.c b/servers/slapd/back-meta/group.c
index a055732886ff47cf6fe61d2cf9a1fdcb7fd1bee6..7c4f35781471660b93be812a96901fd9dc030492 100644 (file)
--- a/servers/slapd/back-meta/group.c
+++ b/servers/slapd/back-meta/group.c
@@ -56,9 +56,9 @@ meta_back_group(
        char *gattr[ 2 ];
        char *filter = NULL, *ptr;
        LDAP *ld = NULL;
-       struct berval mop_ndn = { 0, NULL }, mgr_ndn = { 0, NULL };
+       struct berval mop_ndn = BER_BVNULL, mgr_ndn = BER_BVNULL;
 
-       struct berval group_oc_name = { 0, NULL };
+       struct berval group_oc_name = BER_BVNULL;
        struct berval group_at_name = group_at->ad_cname;
 
        if ( group_oc->soc_names && group_oc->soc_names[ 0 ] ) {

diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c
index c44a1f214cc036faa5800d9877647970e6688015..62ae54b1e5b112e1d80333d9cc6e9a4c7149f86c 100644 (file)
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -41,7 +41,7 @@ meta_back_modify( Operation *op, SlapReply *rs )
        LDAPMod                 *mods = NULL;
        Modifications           *ml;
        int                     candidate = -1, i;
-       struct berval           mdn = { 0, NULL };
+       struct berval           mdn = BER_BVNULL;
        struct berval           mapped;
        dncookie                dc;
 

diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c
index 8d2164c6c5588cd4a4a6ed5ffe4e4b3fd5dff34e..22cdc7c4f51255dab2229997865cf8ff7ea615d2 100644 (file)
--- a/servers/slapd/back-meta/modrdn.c
+++ b/servers/slapd/back-meta/modrdn.c
@@ -50,8 +50,8 @@ meta_back_modrdn( Operation *op, SlapReply *rs )
        struct metaconn         *lc;
        int                     rc = 0;
        int                     candidate = -1;
-       struct berval           mdn = { 0, NULL },
-                               mnewSuperior = { 0, NULL };
+       struct berval           mdn = BER_BVNULL,
+                               mnewSuperior = BER_BVNULL;
        dncookie                dc;
 
        lc = meta_back_getconn( op, rs, META_OP_REQUIRE_SINGLE,

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index ceea4402b43f7026a2b240a559a97d666ea5a98d..2e239e3383f040d601684372ead96fd5fcf3f7b3 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -61,7 +61,7 @@ meta_back_search( Operation *op, SlapReply *rs )
        LDAPMessage     *res = NULL, *e;
        int     rc = 0, *msgid, sres = LDAP_SUCCESS;
        char *err = NULL;
-       struct berval match = { 0, NULL }, mmatch = { 0, NULL };
+       struct berval match = BER_BVNULL, mmatch = BER_BVNULL;
        BerVarray v2refs = NULL;
                
        int i, last = 0, candidates = 0, initial_candidates = 0,
@@ -110,8 +110,8 @@ meta_back_search( Operation *op, SlapReply *rs )
                struct berval   realbase = op->o_req_dn;
                int             realscope = op->ors_scope;
                ber_len_t       suffixlen = 0;
-               struct berval   mbase = { 0, NULL }; 
-               struct berval   mfilter = { 0, NULL };
+               struct berval   mbase = BER_BVNULL; 
+               struct berval   mfilter = BER_BVNULL;
                char            **mapped_attrs = NULL;
 
                if ( lsc->candidate != META_CANDIDATE ) {
@@ -558,7 +558,7 @@ meta_send_entry(
        Entry                   ent = {0};
        BerElement              ber = *e->lm_ber;
        Attribute               *attr, **attrp;
-       struct berval           dummy = { 0, NULL };
+       struct berval           dummy = BER_BVNULL;
        struct berval           *bv, bdn;
        const char              *text;
        dncookie                dc;

diff --git a/servers/slapd/back-monitor/log.c b/servers/slapd/back-monitor/log.c
index 7fa5f548b0a343ef0a00413abda16b5085d10fcb..1510cbfc7207508e4fde99c2c0d9e2f4c58ad106 100644 (file)
--- a/servers/slapd/back-monitor/log.c
+++ b/servers/slapd/back-monitor/log.c
@@ -41,21 +41,21 @@ static struct {
        struct berval s;
        struct berval n;
 } int_2_level[] = {
-       { LDAP_DEBUG_TRACE,     BER_BVC("Trace"),       { 0, NULL } },
-       { LDAP_DEBUG_PACKETS,   BER_BVC("Packets"),     { 0, NULL } },
-       { LDAP_DEBUG_ARGS,      BER_BVC("Args"),        { 0, NULL } },
-       { LDAP_DEBUG_CONNS,     BER_BVC("Conns"),       { 0, NULL } },
-       { LDAP_DEBUG_BER,       BER_BVC("BER"), { 0, NULL } },
-       { LDAP_DEBUG_FILTER,    BER_BVC("Filter"),      { 0, NULL } },
-       { LDAP_DEBUG_CONFIG,    BER_BVC("Config"),      { 0, NULL } },  /* useless */
-       { LDAP_DEBUG_ACL,       BER_BVC("ACL"), { 0, NULL } },
-       { LDAP_DEBUG_STATS,     BER_BVC("Stats"),       { 0, NULL } },
-       { LDAP_DEBUG_STATS2,    BER_BVC("Stats2"),      { 0, NULL } },
-       { LDAP_DEBUG_SHELL,     BER_BVC("Shell"),       { 0, NULL } },
-       { LDAP_DEBUG_PARSE,     BER_BVC("Parse"),       { 0, NULL } },
-       { LDAP_DEBUG_CACHE,     BER_BVC("Cache"),       { 0, NULL } },
-       { LDAP_DEBUG_INDEX,     BER_BVC("Index"),       { 0, NULL } },
-       { 0,                    { 0, NULL },    { 0, NULL } }
+       { LDAP_DEBUG_TRACE,     BER_BVC("Trace"),       BER_BVNULL },
+       { LDAP_DEBUG_PACKETS,   BER_BVC("Packets"),     BER_BVNULL },
+       { LDAP_DEBUG_ARGS,      BER_BVC("Args"),        BER_BVNULL },
+       { LDAP_DEBUG_CONNS,     BER_BVC("Conns"),       BER_BVNULL },
+       { LDAP_DEBUG_BER,       BER_BVC("BER"), BER_BVNULL },
+       { LDAP_DEBUG_FILTER,    BER_BVC("Filter"),      BER_BVNULL },
+       { LDAP_DEBUG_CONFIG,    BER_BVC("Config"),      BER_BVNULL },   /* useless */
+       { LDAP_DEBUG_ACL,       BER_BVC("ACL"), BER_BVNULL },
+       { LDAP_DEBUG_STATS,     BER_BVC("Stats"),       BER_BVNULL },
+       { LDAP_DEBUG_STATS2,    BER_BVC("Stats2"),      BER_BVNULL },
+       { LDAP_DEBUG_SHELL,     BER_BVC("Shell"),       BER_BVNULL },
+       { LDAP_DEBUG_PARSE,     BER_BVC("Parse"),       BER_BVNULL },
+       { LDAP_DEBUG_CACHE,     BER_BVC("Cache"),       BER_BVNULL },
+       { LDAP_DEBUG_INDEX,     BER_BVC("Index"),       BER_BVNULL },
+       { 0,                    BER_BVNULL,     BER_BVNULL }
 };
 
 static int loglevel2int( struct berval *l );
@@ -79,7 +79,7 @@ monitor_subsys_log_init(
        struct berval           desc[] = {
                BER_BVC("This entry allows to set the log level runtime."),
                BER_BVC("Set the attribute 'managedInfo' to the desired log levels."),
-               { 0, NULL }
+               BER_BVNULL
        };
 
        ldap_pvt_thread_mutex_init( &monitor_log_mutex );

diff --git a/servers/slapd/back-monitor/operation.c b/servers/slapd/back-monitor/operation.c
index 0c23b779ebf73158027149bdf56471fe68f804ed..8d9982bd89816801029957087a93c0fda2847fa1 100644 (file)
--- a/servers/slapd/back-monitor/operation.c
+++ b/servers/slapd/back-monitor/operation.c
@@ -40,7 +40,7 @@ static struct berval
                BER_BVC( "Search" ),
                BER_BVC( "Abandon" ),
                BER_BVC( "Extended" ),
-               { 0, NULL }
+               BER_BVNULL
        };
 
 int

diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c
index 3e3560e5690cdfac656f42349045e20883edb0cb..4f7796871959ab3ec77efebabd342bc85e88ca9b 100644 (file)
--- a/servers/slapd/back-passwd/search.c
+++ b/servers/slapd/back-passwd/search.c
@@ -65,7 +65,7 @@ passwd_back_search(
        time_t          stoptime;
 
        LDAPRDN rdn = NULL;
-       struct berval parent = { 0, NULL };
+       struct berval parent = BER_BVNULL;
 
        AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
 

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index c360ea30431977b047ffa5d6dfb5ee3a6c56da59..1423aca172aa19b10c948930a2976ce101c27c80 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -47,8 +47,8 @@ do_bind(
        BerElement *ber = op->o_ber;
        ber_int_t version;
        ber_tag_t method;
-       struct berval mech = { 0, NULL };
-       struct berval dn = { 0, NULL };
+       struct berval mech = BER_BVNULL;
+       struct berval dn = BER_BVNULL;
        ber_tag_t tag;
        Backend *be = NULL;
 

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 8414ad20f2842f95d6c784a1928f2919f5518288..9c483a7a677d71e6e39d8a662e61616d8d4d88a9 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -47,10 +47,10 @@ do_compare(
 )
 {
        Entry *entry = NULL;
-       struct berval dn = { 0, NULL };
-       struct berval desc = { 0, NULL };
-       struct berval value = { 0, NULL };
-       AttributeAssertion ava = { NULL, { 0, NULL } };
+       struct berval dn = BER_BVNULL;
+       struct berval desc = BER_BVNULL;
+       struct berval value = BER_BVNULL;
+       AttributeAssertion ava = { NULL, BER_BVNULL };
        int manageDSAit;
 
        ava.aa_desc = NULL;

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 3f9db3e69f895f051c3f1fdf6c3d2ef52c0ad00b..d157227a8136e5e486fefeb77537730b6c22726f 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -73,11 +73,11 @@ char                *ldap_srvtab = "";
 char           **default_passwd_hash = NULL;
 int            cargc = 0, cargv_size = 0;
 char   **cargv;
-struct berval default_search_base = { 0, NULL };
-struct berval default_search_nbase = { 0, NULL };
+struct berval default_search_base = BER_BVNULL;
+struct berval default_search_nbase = BER_BVNULL;
 unsigned               num_subordinates = 0;
-struct berval global_schemadn = { 0, NULL };
-struct berval global_schemandn = { 0, NULL };
+struct berval global_schemadn = BER_BVNULL;
+struct berval global_schemandn = BER_BVNULL;
 
 ber_len_t sockbuf_max_incoming = SLAP_SB_MAX_INCOMING_DEFAULT;
 ber_len_t sockbuf_max_incoming_auth= SLAP_SB_MAX_INCOMING_AUTH;

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index b829d2c8ca48b28a30215c2d8a8db8a1354a938d..ffcb0312c584ffb32246582326acf12961ffe0f8 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1318,7 +1318,7 @@ int connection_read(ber_socket_t s)
 
                } else if ( rc == 0 ) {
                        void *ssl;
-                       struct berval authid = { 0, NULL };
+                       struct berval authid = BER_BVNULL;
 
                        c->c_needs_tls_accept = 0;
 

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 2651c1e40558141594e0172974088273789d5172..ab5ee35546a0877f097b17d395d4c34ab0aacd40 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -714,7 +714,7 @@ static int parseProxyAuthz (
        LDAPControl *ctrl )
 {
        int             rc;
-       struct berval   dn = { 0, NULL };
+       struct berval   dn = BER_BVNULL;
 
        if ( op->o_proxy_authz != SLAP_NO_CONTROL ) {
                rs->sr_text = "proxy authorization control specified multiple times";
@@ -840,7 +840,7 @@ static int parsePagedResults (
        ber_tag_t tag;
        ber_int_t size;
        BerElement *ber;
-       struct berval cookie = { 0, NULL };
+       struct berval cookie = BER_BVNULL;
 
        if ( op->o_pagedresults != SLAP_NO_CONTROL ) {
                rs->sr_text = "paged results control specified multiple times";
@@ -919,7 +919,7 @@ static int parseAssert (
        LDAPControl *ctrl )
 {
        BerElement      *ber;
-       struct berval   fstr = { 0, NULL };
+       struct berval   fstr = BER_BVNULL;
        const char *err_msg = "";
 
        if ( op->o_assert != SLAP_NO_CONTROL ) {
@@ -1094,7 +1094,7 @@ int parseValuesReturnFilter (
        LDAPControl *ctrl )
 {
        BerElement      *ber;
-       struct berval   fstr = { 0, NULL };
+       struct berval   fstr = BER_BVNULL;
        const char *err_msg = "";
 
        if ( op->o_valuesreturnfilter != SLAP_NO_CONTROL ) {

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index b0d0f0d77673ad0d474753963717f742f102c892..d7257eaffc29940f69a12ac82d958a11b05cd9ae 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1490,7 +1490,7 @@ slapd_daemon_task(
                        socklen_t len = sizeof(from);
                        long id;
                        slap_ssf_t ssf = 0;
-                       struct berval authid = { 0, NULL };
+                       struct berval authid = BER_BVNULL;
 #ifdef SLAPD_RLOOKUPS
                        char hbuf[NI_MAXHOST];
 #endif

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 4e701eaa313d8649fb5b6d3c5ffef79e5288fd13..eded9982950c704973c46943a8d91ee08e8b8088 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -45,12 +45,12 @@ do_delete(
     SlapReply  *rs
 )
 {
-       struct berval dn = { 0, NULL };
-       struct berval pdn = { 0, NULL };
-       struct berval org_req_dn = { 0, NULL };
-       struct berval org_req_ndn = { 0, NULL };
-       struct berval org_dn = { 0, NULL };
-       struct berval org_ndn = { 0, NULL };
+       struct berval dn = BER_BVNULL;
+       struct berval pdn = BER_BVNULL;
+       struct berval org_req_dn = BER_BVNULL;
+       struct berval org_req_ndn = BER_BVNULL;
+       struct berval org_dn = BER_BVNULL;
+       struct berval org_ndn = BER_BVNULL;
        int     org_managedsait;
        int manageDSAit;
 

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index a1b881bf1a4b52c23c127b0c55cea3bf8ef810f9..67c9f52a78378ce75f212a954f1d80a6c8d9c7ed 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -259,7 +259,7 @@ LDAPDN_rewrite( LDAPDN dn, unsigned flags, void *ctx )
                        slap_mr_normalize_func *normf = NULL;
                        slap_syntax_transform_func *transf = NULL;
                        MatchingRule *mr = NULL;
-                       struct berval           bv = { 0, NULL };
+                       struct berval           bv = BER_BVNULL;
                        int                     do_sort = 0;
 
                        assert( ava );

diff --git a/servers/slapd/ldapsync.c b/servers/slapd/ldapsync.c
index cfbbe4b5d96294967c99d6ffc374c94f10b883f0..27da812abd8ea2d786bebbb97f16d486932caa99 100644 (file)
--- a/servers/slapd/ldapsync.c
+++ b/servers/slapd/ldapsync.c
@@ -54,7 +54,7 @@ slap_build_sync_state_ctrl(
        BerElementBuffer berbuf;
        BerElement *ber = (BerElement *)&berbuf;
 
-       struct berval entryuuid_bv      = { 0, NULL };
+       struct berval entryuuid_bv      = BER_BVNULL;
 
        ber_init2( ber, 0, LBER_USE_DER );
        ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
@@ -173,7 +173,7 @@ slap_build_sync_state_ctrl_from_slog(
        BerElementBuffer berbuf;
        BerElement *ber = (BerElement *)&berbuf;
 
-       struct berval entryuuid_bv      = { 0, NULL };
+       struct berval entryuuid_bv      = BER_BVNULL;
 
        ber_init2( ber, NULL, LBER_USE_DER );
        ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
@@ -444,9 +444,9 @@ slap_init_sync_cookie_ctxcsn(
 )
 {
        char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE + 4 ];
-       struct berval octet_str = { 0, NULL };
-       struct berval ctxcsn = { 0, NULL };
-       struct berval ctxcsn_dup = { 0, NULL };
+       struct berval octet_str = BER_BVNULL;
+       struct berval ctxcsn = BER_BVNULL;
+       struct berval ctxcsn_dup = BER_BVNULL;
        struct berval slap_syncCookie;
 
        if ( cookie == NULL )
@@ -523,7 +523,7 @@ slap_build_syncUUID_set(
        int ret;
        Attribute* a;
 
-       struct berval entryuuid_bv      = { 0, NULL };
+       struct berval entryuuid_bv      = BER_BVNULL;
 
        for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
                AttributeDescription *desc = a->a_desc;

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index a0cd1380dbff630f260137c6e0e088eac12f9545..528867ba00163986dcce9300541caad4fc7f4a73 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -185,7 +185,7 @@ int main( int argc, char **argv )
        char        *serverName;
        int         serverMode = SLAP_SERVER_MODE;
 
-       struct berval cookie = { 0, NULL };
+       struct berval cookie = BER_BVNULL;
        struct sync_cookie *scp = NULL;
        struct sync_cookie *scp_entry = NULL;
 

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index ea498a0f062b5dd50ecf6c09b6d660ac9e63cccc..0f81ef1a3962d23dd7e96e101f942aaf69fb32f0 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -44,7 +44,7 @@ do_modify(
     Operation  *op,
     SlapReply  *rs )
 {
-       struct berval dn = { 0, NULL };
+       struct berval dn = BER_BVNULL;
        char            *last;
        ber_tag_t       tag;
        ber_len_t       len;

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index ae45b32a7cb7396c0fb42e7388196a76772c7a3e..205ea71166abfc25b70f9d1bb5cc8c366ce5ca75 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -50,24 +50,24 @@ do_modrdn(
     SlapReply  *rs
 )
 {
-       struct berval dn = { 0, NULL };
-       struct berval newrdn = { 0, NULL };
-       struct berval newSuperior = { 0, NULL };
+       struct berval dn = BER_BVNULL;
+       struct berval newrdn = BER_BVNULL;
+       struct berval newSuperior = BER_BVNULL;
        ber_int_t       deloldrdn;
 
-       struct berval pnewSuperior = { 0, NULL };
+       struct berval pnewSuperior = BER_BVNULL;
 
-       struct berval nnewSuperior = { 0, NULL };
+       struct berval nnewSuperior = BER_BVNULL;
 
        Backend *newSuperior_be = NULL;
        ber_len_t       length;
        int manageDSAit;
 
-       struct berval pdn = { 0, NULL };
-       struct berval org_req_dn = { 0, NULL };
-       struct berval org_req_ndn = { 0, NULL };
-       struct berval org_dn = { 0, NULL };
-       struct berval org_ndn = { 0, NULL };
+       struct berval pdn = BER_BVNULL;
+       struct berval org_req_dn = BER_BVNULL;
+       struct berval org_req_ndn = BER_BVNULL;
+       struct berval org_dn = BER_BVNULL;
+       struct berval org_ndn = BER_BVNULL;
        int     org_managedsait;
 
 #ifdef NEW_LOGGING

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index ce2af55cba940a4a88b612efcbaed1a49c27d2d3..029be6ce5b0d97064b4ac22ee9a9fd71e7d944a0 100644 (file)
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -48,9 +48,9 @@ get_mra(
        int rc;
        ber_tag_t tag, rtag;
        ber_len_t length;
-       struct berval type = { 0, NULL };
-       struct berval value = { 0, NULL };
-       struct berval rule_text = { 0, NULL };
+       struct berval type = BER_BVNULL;
+       struct berval value = BER_BVNULL;
+       struct berval rule_text = BER_BVNULL;
        MatchingRuleAssertion ma;
 
        memset( &ma, 0, sizeof ma);

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 8c74437d474443e19b6a9ecfa4187424655730e7..3374f37f07da2bd8d195d8c2b7ef91c02507a119 100644 (file)
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -205,7 +205,7 @@ static int base_scope_compare(
        int scope_stored,
        int scope_incoming      )
 {
-       struct berval pdn_incoming = { 0, NULL };
+       struct berval pdn_incoming = BER_BVNULL;
 
        if (scope_stored < scope_incoming)
                return 0;

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index d9cee2cf1129a0bb8eaa032af07241dc6aad32a4..084803987bba96c6e0bc28a78131c892b1b9af0d 100644 (file)
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -1246,7 +1246,7 @@ ppolicy_modify( Operation *op, SlapReply *rs )
        pw_hist                 *tl = NULL, *p;
        int                     zapReset, send_ctrl = 0;
        Entry                   *e;
-       struct berval           newpw = { 0, NULL }, oldpw = { 0, NULL },
+       struct berval           newpw = BER_BVNULL, oldpw = BER_BVNULL,
                                *bv, cr[2];
        LDAPPasswordPolicyError pErr = PP_noError;
 

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 56d6294ddc3df058d30f83903c4b4c7e0c8d0838..20f40dab49f4aff4e50bcd689005f97d44fa08a9 100644 (file)
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -31,7 +31,7 @@ rwm_op_dn_massage( Operation *op, SlapReply *rs, void *cookie )
        struct ldaprwmap        *rwmap = 
                        (struct ldaprwmap *)on->on_bi.bi_private;
 
-       struct berval           dn, ndn, mdn = { 0, NULL };
+       struct berval           dn, ndn, mdn = BER_BVNULL;
        int                     rc = 0;
        dncookie                dc;
 
@@ -200,8 +200,8 @@ rwm_compare( Operation *op, SlapReply *rs )
                        (struct ldaprwmap *)on->on_bi.bi_private;
 
        int                     rc;
-       struct berval           mapped_at = { 0, NULL },
-                               mapped_vals[2] = { { 0, NULL }, { 0, NULL } };
+       struct berval           mapped_at = BER_BVNULL,
+                               mapped_vals[2] = { BER_BVNULL, BER_BVNULL };
 
 #ifdef ENABLE_REWRITE
        rc = rwm_op_dn_massage( op, rs, "compareDn" );
@@ -422,7 +422,7 @@ rwm_send_entry( Operation *op, SlapReply *rs )
                        (struct ldaprwmap *)on->on_bi.bi_private;
 
        Entry           *e = NULL;
-       struct berval   dn = { 0, NULL }, ndn = { 0, NULL };
+       struct berval   dn = BER_BVNULL, ndn = BER_BVNULL;
        dncookie        dc;
        int             rc = SLAP_CB_CONTINUE;
 

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index e9c99c895f9bff4d1474fd8c1ab5c0e01583b46b..a55d32d07b1fc661521c2be710b6128542468975 100644 (file)
--- a/servers/slapd/referral.c
+++ b/servers/slapd/referral.c
@@ -40,9 +40,9 @@ static char * referral_dn_muck(
 {
        int rc;
        struct berval bvin;
-       struct berval nrefDN = { 0, NULL };
-       struct berval nbaseDN = { 0, NULL };
-       struct berval ntargetDN = { 0, NULL };
+       struct berval nrefDN = BER_BVNULL;
+       struct berval nbaseDN = BER_BVNULL;
+       struct berval ntargetDN = BER_BVNULL;
 
        if( !baseDN ) {
                /* no base, return target */

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index cffc17423c305465c73c6c4c83d8540cf981250f..2c2bdf7aa38eb4164fdbffecb07eb70bac5c7043 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1615,9 +1615,9 @@ char* slap_sasl_secprops( const char *in )
 int
 slap_sasl_setpass( Operation *op, SlapReply *rs )
 {
-       struct berval id = { 0, NULL }; /* needs to come from connection */
-       struct berval new = { 0, NULL };
-       struct berval old = { 0, NULL };
+       struct berval id = BER_BVNULL;  /* needs to come from connection */
+       struct berval new = BER_BVNULL;
+       struct berval old = BER_BVNULL;
 
        assert( ber_bvcmp( &slap_EXOP_MODIFY_PASSWD, &op->ore_reqoid ) == 0 );
 
@@ -1783,7 +1783,7 @@ int slap_sasl_getdn( Connection *conn, Operation *op, char *id, int len,
        /* Username strings */
        if( is_dn == SET_U ) {
                char            *p;
-               struct berval   realm = { 0, NULL }, c1 = *dn;
+               struct berval   realm = BER_BVNULL, c1 = *dn;
 
                len = dn->bv_len + sizeof("uid=")-1 + sizeof(",cn=auth")-1;
 

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 48ab0e900445932985069c94e196279152c2f987..edd348657ea769994a81462dd2c9c07d5d4413d7 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -276,9 +276,9 @@ is_dn:              bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val);
                Connection      c = *op->o_conn;
                char            buf[ SLAP_LDAPDN_MAXLEN ];
                struct berval   id,
-                               user = { 0, NULL },
-                               realm = { 0, NULL },
-                               mech = { 0, NULL };
+                               user = BER_BVNULL,
+                               realm = BER_BVNULL,
+                               mech = BER_BVNULL;
 
                if ( sizeof( buf ) <= uri->bv_len ) {
                        return LDAP_INVALID_SYNTAX;
@@ -849,7 +849,7 @@ void slap_sasl2dn( Operation *opx,
        slap_callback cb = { NULL, sasl_sc_sasl2dn, NULL, NULL };
        Operation op = {0};
        SlapReply rs = {REP_RESULT};
-       struct berval regout = { 0, NULL };
+       struct berval regout = BER_BVNULL;
 
 #ifdef NEW_LOGGING
        LDAP_LOG( TRANSPORT, ENTRY, 

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index e6169e44f5647eb95d2b0d1483d1b8f3089bfc3c..499935beed43b870e1e0d94b28d0b5824958dd32 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -804,7 +804,7 @@ nameUIDPretty(
        } else {
                int rc;
                struct berval dnval = *val;
-               struct berval uidval = { 0, NULL };
+               struct berval uidval = BER_BVNULL;
 
                if( val->bv_val[val->bv_len-1] == 'B'
                        && val->bv_val[val->bv_len-2] == '\'' )
@@ -875,7 +875,7 @@ uniqueMemberNormalize(
 
        ber_dupbv( &out, val );
        if( out.bv_len != 0 ) {
-               struct berval uid = { 0, NULL };
+               struct berval uid = BER_BVNULL;
 
                if( out.bv_val[out.bv_len-1] == 'B'
                        && out.bv_val[out.bv_len-2] == '\'' )
@@ -935,10 +935,10 @@ uniqueMemberMatch(
 {
        int match;
        struct berval *asserted = (struct berval *) assertedValue;
-       struct berval assertedDN = { 0, NULL };
-       struct berval assertedUID = { 0, NULL };
-       struct berval valueDN = { 0, NULL };
-       struct berval valueUID = { 0, NULL };
+       struct berval assertedDN = BER_BVNULL;
+       struct berval assertedUID = BER_BVNULL;
+       struct berval valueDN = BER_BVNULL;
+       struct berval valueUID = BER_BVNULL;
 
        if( asserted->bv_len != 0 ) {
                assertedDN = *asserted;
@@ -1372,7 +1372,7 @@ approxIndexer(
        BerVarray keys=NULL;
 
        for( j=0; values[j].bv_val != NULL; j++ ) {
-               struct berval val = { 0, NULL };
+               struct berval val = BER_BVNULL;
                /* Yes, this is necessary */
                UTF8bvnormalize( &values[j], &val, LDAP_UTF8_APPROX, NULL );
                assert( val.bv_val != NULL );
@@ -2210,7 +2210,7 @@ certificateExactNormalize(
        unsigned char *p;
        char *serial = NULL;
        ber_len_t seriallen;
-       struct berval issuer_dn = { 0, NULL };
+       struct berval issuer_dn = BER_BVNULL;
        X509_NAME *name = NULL;
        ASN1_INTEGER *sn = NULL;
        X509 *xcert = NULL;

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 91dcdb2b2f0115d29affcc522e9ee285b489150f..52e7d5a3dafdbf40e95368393aaae60f216d1618 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -49,7 +49,7 @@ do_search(
     Operation  *op,    /* info about the op to which we're responding */
     SlapReply  *rs     /* all the response data we'll send */
 ) {
-       struct berval base = { 0, NULL };
+       struct berval base = BER_BVNULL;
        ber_len_t       siz, off, i;
        int                     manageDSAit;
        int                     be_manageDSAit;

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 0d164f2b8dd6c56ca5ab7fe11739d6a752fb50c2..54421f5fba8fb877586c8c3ce3fb273735321f8a 100644 (file)
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -66,8 +66,8 @@ slapadd( int argc, char **argv )
        const char *progname = "slapadd";
 
        struct berval csn;
-       struct berval maxcsn = { 0, NULL };
-       struct berval ldifcsn = { 0, NULL };
+       struct berval maxcsn = BER_BVNULL;
+       struct berval ldifcsn = BER_BVNULL;
        int match;
        int     provider_subentry = 0;
        struct subentryinfo *sei;
@@ -75,7 +75,7 @@ slapadd( int argc, char **argv )
        Attribute *attr;
        Entry *ctxcsn_e;
        ID      ctxcsn_id;
-       struct berval   ctxcsn_ndn = { 0, NULL };
+       struct berval   ctxcsn_ndn = BER_BVNULL;
        int ret;
        struct berval bvtext;
        int i;

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 4944272d911a73c9924d788d1c29a7e1848a16d9..a04be91af650278b5f438c420c7086b36abf9e00 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -94,7 +94,7 @@ slap_tool_init(
 {
        char *options;
        char *conffile = SLAPD_DEFAULT_CONFIGFILE;
-       struct berval base = { 0, NULL };
+       struct berval base = BER_BVNULL;
        char *subtree = NULL;
        char *ldiffile  = NULL;
        int rc, i, dbnum;

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index 5d0c93675b230f8f82f3224eb1e66ebc2f303807..e08b23bb6d0df7641d25f6679a1b2e8b2c986749 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -342,7 +342,7 @@ slapi_int_ldapmod_to_entry(
        char *ldn, 
        LDAPMod **mods )
 {
-       struct berval           dn = { 0, NULL };
+       struct berval           dn = BER_BVNULL;
        Entry                   *pEntry=NULL;
        LDAPMod                 *pMod;
        struct berval           *bv;
@@ -516,7 +516,7 @@ slapi_delete_internal(
        Slapi_PBlock            *pPB = NULL;
        Slapi_PBlock            *pSavePB = NULL;
        SlapReply               rs = { REP_RESULT };
-       struct berval           dn = { 0, NULL };
+       struct berval           dn = BER_BVNULL;
 
        int                     manageDsaIt = 0;
        int                     isCritical;
@@ -763,8 +763,8 @@ slapi_modrdn_internal(
        int log_change )
 {
 #ifdef LDAP_SLAPI
-       struct berval           dn = { 0, NULL };
-       struct berval           newrdn = { 0, NULL };
+       struct berval           dn = BER_BVNULL;
+       struct berval           newrdn = BER_BVNULL;
        Connection              *pConn = NULL;
        Operation               *op = NULL;
        Slapi_PBlock            *pPB = NULL;
@@ -893,7 +893,7 @@ slapi_modify_internal(
        Slapi_PBlock            *pPB = NULL;
        Slapi_PBlock            *pSavePB = NULL;
 
-       struct berval dn = { 0, NULL };
+       struct berval dn = BER_BVNULL;
 
        int                     manageDsaIt = 0;
        int                     isCritical;
@@ -1088,9 +1088,9 @@ slapi_search_internal(
        Operation               *op = NULL;
        Slapi_PBlock            *ptr = NULL;            
        Slapi_PBlock            *pSavePB = NULL;                
-       struct berval           dn = { 0, NULL };
+       struct berval           dn = BER_BVNULL;
        Filter                  *filter=NULL;
-       struct berval           fstr = { 0, NULL };
+       struct berval           fstr = BER_BVNULL;
        AttributeName           *an = NULL;
        const char              *text = NULL;
 

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index e95c10779594425806b7f65c8fed76ba63e8b4cf..5b5172e015489fc0ff12d79fa9aef9db30556375 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -171,7 +171,7 @@ slapi_entry_set_dn(
        char            *ldn )
 {
 #ifdef LDAP_SLAPI
-       struct berval   dn = { 0, NULL };
+       struct berval   dn = BER_BVNULL;
 
        dn.bv_val = ldn;
        dn.bv_len = strlen( ldn );

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 88da2c36d2383bc58f5a9dc93b3c60267ba56354..5b2f8e809232198564c905a3e882580961a7700b 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -343,7 +343,7 @@ do_syncrep1(
                        sc = NULL;
                } else {
                        /* stored cookie */
-                       struct berval newcookie = { 0, NULL };
+                       struct berval newcookie = BER_BVNULL;
                        ber_dupbv( &cookie_bv, &cookie[0] );
                        ber_bvarray_add( &si->si_syncCookie.octet_str, &cookie_bv );
                        slap_parse_sync_cookie( &si->si_syncCookie );
@@ -434,10 +434,10 @@ do_syncrep2(
        Entry           *entry = NULL;
 
        int             syncstate;
-       struct berval   syncUUID = { 0, NULL };
+       struct berval   syncUUID = BER_BVNULL;
        struct sync_cookie      syncCookie = { NULL, -1, NULL };
        struct sync_cookie      syncCookie_req = { NULL, -1, NULL };
-       struct berval           cookie = { 0, NULL };
+       struct berval           cookie = BER_BVNULL;
 
        int     rc, err, i;
        ber_len_t       len;
@@ -1042,8 +1042,8 @@ syncrepl_entry(
        Backend *be = op->o_bd;
        slap_callback   cb = { NULL };
        struct berval   *syncuuid_bv = NULL;
-       struct berval   syncUUID_strrep = { 0, NULL };
-       struct berval   uuid_bv = { 0, NULL };
+       struct berval   syncUUID_strrep = BER_BVNULL;
+       struct berval   uuid_bv = BER_BVNULL;
 
        SlapReply       rs = {REP_RESULT};
        Filter f = {0};
@@ -1052,11 +1052,11 @@ syncrepl_entry(
        int ret = LDAP_SUCCESS;
        const char *text;
 
-       struct berval pdn = { 0, NULL };
-       struct berval org_req_dn = { 0, NULL };
-       struct berval org_req_ndn = { 0, NULL };
-       struct berval org_dn = { 0, NULL };
-       struct berval org_ndn = { 0, NULL };
+       struct berval pdn = BER_BVNULL;
+       struct berval org_req_dn = BER_BVNULL;
+       struct berval org_req_ndn = BER_BVNULL;
+       struct berval org_dn = BER_BVNULL;
+       struct berval org_ndn = BER_BVNULL;
        int     org_managedsait;
 
        if (( syncstate == LDAP_SYNC_PRESENT || syncstate == LDAP_SYNC_ADD ))
@@ -1305,11 +1305,11 @@ syncrepl_del_nonpresent(
        Modifications **modtail = &modlist;
        Attribute       *attr;
 
-       struct berval pdn = { 0, NULL };
-       struct berval org_req_dn = { 0, NULL };
-       struct berval org_req_ndn = { 0, NULL };
-       struct berval org_dn = { 0, NULL };
-       struct berval org_ndn = { 0, NULL };
+       struct berval pdn = BER_BVNULL;
+       struct berval org_req_dn = BER_BVNULL;
+       struct berval org_req_ndn = BER_BVNULL;
+       struct berval org_dn = BER_BVNULL;
+       struct berval org_ndn = BER_BVNULL;
        int     org_managedsait;
 
        op->o_req_dn = si->si_base;

diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index bf8077c7c68bcec966285e3ce83c93eb772b0fbb..bbbd318e978cfa0f4a919bb306c661acd229923a 100644 (file)
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -217,8 +217,8 @@ value_match(
        const char ** text )
 {
        int rc;
-       struct berval nv1 = { 0, NULL };
-       struct berval nv2 = { 0, NULL };
+       struct berval nv1 = BER_BVNULL;
+       struct berval nv2 = BER_BVNULL;
 
        assert( mr != NULL );
 
@@ -246,7 +246,7 @@ int value_find_ex(
 {
        int     i;
        int rc;
-       struct berval nval = { 0, NULL };
+       struct berval nval = BER_BVNULL;
        MatchingRule *mr = ad->ad_type->sat_equality;
 
        if( mr == NULL || !mr->smr_match ) {