Sync with HEAD

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/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index 0841ddb6e02c306211d73eb206b3a79270947ac3..56d69eb2099d16b06222749bc46b2493694381d9 100644 (file)
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -72,10 +72,10 @@ perl_back_modify(
                        XPUSHs(sv_2mortal(newSVpv( mods->sm_desc->ad_cname.bv_val, 0 )));
 
                        for ( i = 0;
-                               mods->sm_bvalues != NULL && mods->sm_bvalues[i].bv_val != NULL;
+                               mods->sm_values != NULL && mods->sm_values[i].bv_val != NULL;
                                i++ )
                        {
-                               XPUSHs(sv_2mortal(newSVpv( mods->sm_bvalues[i].bv_val, 0 )));
+                               XPUSHs(sv_2mortal(newSVpv( mods->sm_values[i].bv_val, 0 )));
                        }
                }