upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-19 05:13:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Propagate config errors back to caller.

Browse source
This commit is contained in:
Howard Chu 2005-05-06 20:20:45 +00:00
parent e3840aa8af
commit 6d7b27fcca
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/back-ldif/ldif.c
View file

@ -349,7 +349,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
ck->op->oq_search.rs_scope == LDAP_SCOPE_ONELEVEL
? LDAP_SCOPE_BASE : LDAP_SCOPE_SUBTREE );
send_search_reference( ck->op, ck->rs );
rc = send_search_reference( ck->op, ck->rs );
ber_bvarray_free( ck->rs->sr_ref );
ber_bvarray_free( erefs );
@ -360,9 +360,11 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
ck->rs->sr_entry = e;
ck->rs->sr_attrs = ck->op->ors_attrs;
ck->rs->sr_flags = REP_ENTRY_MODIFIABLE;
send_search_entry(ck->op, ck->rs);
rc = send_search_entry(ck->op, ck->rs);
}
fd = 1;
if ( rc )
goto leave;
} else {
/* Queueing up for tool mode */
if(ck->entries == NULL) {

6
servers/slapd/bconfig.c
View file

@ -2408,7 +2408,7 @@ config_setup_ldif( BackendDB *be, const char *dir, int readit ) {
ConfigArgs c = {0};
ConfigTable *ct;
char *argv[3];
int rc;
int rc = 0;
slap_callback cb = { NULL, config_ldif_resp, NULL, NULL };
Connection conn = {0};
char opbuf[OPERATION_BUFFER_SIZE];
@ -2488,12 +2488,12 @@ config_setup_ldif( BackendDB *be, const char *dir, int readit ) {
cb.sc_private = cfb;
op->o_bd = &cfb->cb_db;
op->o_bd->be_search( op, &rs );
rc = op->o_bd->be_search( op, &rs );
}
cfb->cb_use_ldif = 1;
return 0;
return rc;
}
static int