sync with HEAD

diff --git a/servers/slapd/ldapsync.c b/servers/slapd/ldapsync.c
index 167ff22df28a63ad7f41d951d34614746c200ade..cfbbe4b5d96294967c99d6ffc374c94f10b883f0 100644 (file)
--- 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 6ed92e3479703def8651e7dce871e8c3341502bd..e266b0e4063b18ea9e8e7b6090a2d01aa2c1175a 100644 (file)
--- 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 ccaf55d9a9cb7aebe8dffb8daa5a1932b7e34a47..79e51ed9c122cd4f94ee3834c31a084e0454f470 100644 (file)
--- 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 9a956b32797ec189cda6074bce5ef865689689bf..a77e2c6bcb4dd822456bf8047da1b47ddc0f458f 100644 (file)
--- 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;