noop commit for ITS#6758: simplify future commits

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index de159d96e98faf86980623fe56c38909c807df61..e650b02b2bec51cb45108f48f2efbaaecb2a2336 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -6778,9 +6778,11 @@ config_back_db_open( BackendDB *be, ConfigReply *cr )
 
        /* Create schema nodes for included schema... */
        if ( cfb->cb_config->c_kids ) {
+               int rc;
                c.depth = 0;
                c.ca_private = cfb->cb_config->c_kids;
-               if (config_build_schema_inc( &c, ce, op, &rs )) {
+               rc = config_build_schema_inc( &c, ce, op, &rs );
+               if ( rc ) {
                        return -1;
                }
        }

diff --git a/servers/slapd/overlays/refint.c b/servers/slapd/overlays/refint.c
index 1207bfaa492d078a734f5e73a9b0c5acdd88f987..063bd5c3443a21fdc014d7303c66c35d04ffbc0e 100644 (file)
--- a/servers/slapd/overlays/refint.c
+++ b/servers/slapd/overlays/refint.c
@@ -671,7 +671,8 @@ refint_repair(
                op2.o_dn = op2.o_bd->be_rootdn;
                op2.o_ndn = op2.o_bd->be_rootndn;
                slap_op_time( &op2.o_time, &op2.o_tincr );
-               if ( ( rc = op2.o_bd->be_modify( &op2, &rs2 ) ) != LDAP_SUCCESS ) {
+               rc = op2.o_bd->be_modify( &op2, &rs2 );
+               if ( rc != LDAP_SUCCESS ) {
                        Debug( LDAP_DEBUG_TRACE,
                                "refint_repair: dependent modify failed: %d\n",
                                rs2.sr_err, 0, 0 );

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 7fa8e73ea7911423d51426f6b534c05d0106719f..0dc00c9427a1c5fe9aafe530e34db1d7e8adbf08 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1709,7 +1709,7 @@ syncprov_playlog( Operation *op, SlapReply *rs, sessionlog *sl,
                fop.o_bd->bd_info = (BackendInfo *)on->on_info;
 
                for ( i=ndel; i<num; i++ ) {
-                       if ( uuids[i].bv_len == 0 ) continue;
+                 if ( uuids[i].bv_len != 0 ) {
 
                        mf.f_av_value = uuids[i];
                        cb.sc_private = NULL;
@@ -1721,6 +1721,7 @@ syncprov_playlog( Operation *op, SlapReply *rs, sessionlog *sl,
                        if ( !cb.sc_private ) {
                                uuids[ndel++] = uuids[i];
                        }
+                 }
                }
                fop.o_bd->bd_info = (BackendInfo *)on;
        }

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index ed855279893b7f604d3c92e3744c876486669eb5..f83d605d6c5289c5f39bf34434e4ba72bce8f00c 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -623,20 +623,22 @@ slap_auxprop_store(
                        op.o_req_dn = op.o_req_ndn;
                        op.orm_modlist = modlist;
 
-retry_dontUseCopy:;
-                       rc = op.o_bd->be_modify( &op, &rs );
+                       for (;;) {
+                               rc = op.o_bd->be_modify( &op, &rs );
 
 #ifdef SLAP_AUXPROP_DONTUSECOPY
-                       if ( dontUseCopy &&
-                               rs.sr_err == LDAP_UNAVAILABLE &&
-                               slap_dontUseCopy_ignore )
-                       {
-                               op.o_bd = dontUseCopy_bd;
-                               op.o_dontUseCopy = SLAP_CONTROL_NONE;
-                               dontUseCopy = 0;
-                               goto retry_dontUseCopy;
-                       }
+                               if ( dontUseCopy &&
+                                       rs.sr_err == LDAP_UNAVAILABLE &&
+                                       slap_dontUseCopy_ignore )
+                               {
+                                       op.o_bd = dontUseCopy_bd;
+                                       op.o_dontUseCopy = SLAP_CONTROL_NONE;
+                                       dontUseCopy = 0;
+                                       continue;
+                               }
 #endif /* SLAP_AUXPROP_DONTUSECOPY */
+                               break;
+                       }
                }
        }
        slap_mods_free( modlist, 1 );