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

further cleanup

Browse Source
This commit is contained in:
Pierangelo Masarati 2006-01-16 23:28:08 +00:00
parent 327fd9e7f8
commit 5ffc8c2588
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
servers/slapd/bconfig.c
View File

@ -3761,7 +3761,10 @@ config_back_add( Operation *op, SlapReply *rs )
rs->sr_err = config_add_internal( cfb, op->ora_e, &ca, rs, &renumber ); rs->sr_err = config_add_internal( cfb, op->ora_e, &ca, rs, &renumber );
if ( rs->sr_err != LDAP_SUCCESS ) { if ( rs->sr_err != LDAP_SUCCESS ) {
rs->sr_text = ca.msg; rs->sr_text = ca.msg;
} else if ( cfb->cb_use_ldif ) { goto out2;
}
if ( cfb->cb_use_ldif ) {
BackendDB *be = op->o_bd; BackendDB *be = op->o_bd;
slap_callback sc = { NULL, slap_null_cb, NULL, NULL }; slap_callback sc = { NULL, slap_null_cb, NULL, NULL };
struct berval dn, ndn; struct berval dn, ndn;
@ -3783,9 +3786,14 @@ config_back_add( Operation *op, SlapReply *rs )
op->o_ndn = ndn; op->o_ndn = ndn;
} }
if ( renumber ) {
/* TODO */
}
out2:;
ldap_pvt_thread_pool_resume( &connection_pool ); ldap_pvt_thread_pool_resume( &connection_pool );
out: out:;
send_ldap_result( op, rs ); send_ldap_result( op, rs );
return rs->sr_err; return rs->sr_err;
} }
@ -4826,6 +4834,9 @@ config_back_initialize( BackendInfo *bi )
NULL NULL
}; };
/* Make sure we don't exceed the bits reserved for userland */
config_check_userland( CFG_LAST );
bi->bi_controls = controls; bi->bi_controls = controls;
bi->bi_open = 0; bi->bi_open = 0;
@ -4867,9 +4878,6 @@ config_back_initialize( BackendInfo *bi )
bi->bi_tool_entry_get = config_tool_entry_get; bi->bi_tool_entry_get = config_tool_entry_get;
bi->bi_tool_entry_put = config_tool_entry_put; bi->bi_tool_entry_put = config_tool_entry_put;
/* Make sure we don't exceed the bits reserved for userland */
assert( ( ( CFG_LAST - 1 ) & ARGS_USERLAND ) == ( CFG_LAST - 1 ) );
argv[3] = NULL; argv[3] = NULL;
for (i=0; OidMacros[i].name; i++ ) { for (i=0; OidMacros[i].name; i++ ) {
argv[1] = OidMacros[i].name; argv[1] = OidMacros[i].name;