From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 17 Jan 2004 20:32:20 +0000 (+0000)
Subject: sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_5~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=de672895cbd0766d4c271b63be7e83fa14b9c003;p=openldap

sync with HEAD
---

diff --git a/servers/slapd/ldapsync.c b/servers/slapd/ldapsync.c
index 167ff22df2..cfbbe4b5d9 100644
--- a/servers/slapd/ldapsync.c
+++ b/servers/slapd/ldapsync.c
@@ -435,6 +435,7 @@ slap_parse_sync_cookie(
 	} else {
 		cookie->rid = -1;
 	}
+	return 0;
 }
 
 int
diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 6ed92e3479..e266b0e406 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -637,7 +637,10 @@ sasl_cb_checkpass( Operation *op, SlapReply *rs )
 	a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_userPassword );
 	if ( !a ) return 0;
 	if ( ! access_allowed( op, rs->sr_entry, slap_schema.si_ad_userPassword,
-		NULL, ACL_AUTH, NULL ) ) return 0;
+		NULL, ACL_AUTH, NULL ) )
+	{
+		return 0;
+	}
 
 	for ( bv = a->a_vals; bv->bv_val != NULL; bv++ ) {
 		if ( !lutil_passwd( bv, &ci->cred, NULL, &rs->sr_text ) ) {
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index ccaf55d9a9..79e51ed9c1 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -422,7 +422,7 @@ static struct slap_schema_ad_map {
 			"EQUALITY octetStringMatch "
 			"ORDERING octetStringOrderingMatch "
 			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 "
-			"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
+			"SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )",
 		NULL, SLAP_AT_HIDE,
 		NULL, NULL,
 		NULL, NULL, NULL, NULL, NULL,
@@ -434,7 +434,7 @@ static struct slap_schema_ad_map {
 			"EQUALITY octetStringMatch "
 			"ORDERING octetStringOrderingMatch "
 			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 "
-			"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
+			"SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )",
 		NULL, SLAP_AT_HIDE,
 		NULL, NULL,
 		NULL, NULL, NULL, NULL, NULL,
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 9a956b3279..a77e2c6bcb 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1710,8 +1710,7 @@ nonpresent_callback(
 static int
 null_callback(
 	Operation*	op,
-	SlapReply*	rs
-)
+	SlapReply*	rs )
 {
 	if ( rs->sr_err != LDAP_SUCCESS &&
 		rs->sr_err != LDAP_REFERRAL &&
@@ -1736,8 +1735,7 @@ slap_create_syncrepl_entry(
 	Backend *be,
 	struct berval *context_csn,
 	struct berval *rdn,
-	struct berval *cn
-)
+	struct berval *cn )
 {
 	Entry* e;