Sync with HEAD

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index 53e29906e62ea01e48d2e594990802efb2699a79..837f4d3a3afa2cd5d6c7440560621c689e7680c6 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;
@@ -90,7 +90,7 @@ ldap_back_add(
        dc.ctx = "addAttrDN";
 #endif
 
-       isupdate = be_isupdate( op );
+       isupdate = be_shadow_update( op );
        for (i=0, a=op->oq_add.rs_e->e_attrs; a; a=a->a_next) {
                if ( !isupdate && a->a_desc->ad_type->sat_no_user_mod  ) {
                        continue;

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/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;