mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix test050

Browse Source
This commit is contained in:
Howard Chu 2007-11-20 14:56:20 +00:00
parent f08b26adbc
commit 8429013957
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/bconfig.c
View File

@ -4909,6 +4909,7 @@ config_back_modify( Operation *op, SlapReply *rs )
struct berval rdn;
char *ptr;
AttributeDescription *rad = NULL;
int do_pause = 1;
cfb = (CfBackInfo *)op->o_bd->be_private;
@ -4939,11 +4940,17 @@ config_back_modify( Operation *op, SlapReply *rs )
rs->sr_text = "Use modrdn to change the entry name";
goto out;
}
/* Internal update of contextCSN? */
if ( ml->sml_desc == slap_schema.si_ad_contextCSN && op->o_conn->c_conn_idx == -1 ) {
do_pause = 0;
break;
}
}
slap_mods_opattrs( op, &op->orm_modlist, 1 );
ldap_pvt_thread_pool_pause( &connection_pool );
if ( do_pause )
ldap_pvt_thread_pool_pause( &connection_pool );
/* Strategy:
* 1) perform the Modify on the cached Entry.
@ -4975,7 +4982,8 @@ config_back_modify( Operation *op, SlapReply *rs )
op->o_ndn = ndn;
}
ldap_pvt_thread_pool_resume( &connection_pool );
if ( do_pause )
ldap_pvt_thread_pool_resume( &connection_pool );
out:
send_ldap_result( op, rs );
slap_graduate_commit_csn( op );

1
servers/slapd/connection.c
View File

@ -1257,6 +1257,7 @@ void connection_client_stop(
c->c_listener = NULL;
c->c_conn_state = SLAP_C_INVALID;
c->c_struct_state = SLAP_C_UNUSED;
c->c_sd = AC_SOCKET_INVALID;
c->c_close_reason = "?"; /* should never be needed */
sb = c->c_sb;
c->c_sb = ber_sockbuf_alloc( );

1
servers/slapd/syncrepl.c
View File

@ -522,6 +522,7 @@ do_syncrep1(
if ( ber_bvarray_dup_x( &si->si_syncCookie.ctxcsn,
si->si_cookieState->cs_vals, NULL )) {
rc = LDAP_NO_MEMORY;
ldap_pvt_thread_mutex_unlock( &si->si_cookieState->cs_mutex );
goto done;
}
si->si_syncCookie.numcsns = si->si_cookieState->cs_num;