From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 12 Apr 2004 17:54:43 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_9~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=69672fd79eb6728692f4f83ea78b072417e0eb35;p=openldap

Sync with HEAD
---

diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c
index 3e3560e569..4f77968719 100644
--- 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 0841ddb6e0..56d69eb209 100644
--- 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 )));
 			}
 		}