mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

noop commit for ITS#6758: simplify future commits

Browse Source
This commit is contained in:
Hallvard Furuseth 2010-12-30 23:48:41 +00:00
parent 98966abeef
commit f7a77545ad
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servers/slapd/bconfig.c
View File

@ -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;
}
}

3
servers/slapd/overlays/refint.c
View File

@ -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 );

3
servers/slapd/overlays/syncprov.c
View File

@ -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;
}

24
servers/slapd/sasl.c
View File

@ -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 );