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

Fix error message propagation

Browse source
This commit is contained in:
Howard Chu 2007-10-15 10:22:51 +00:00
parent a8ba9e2131
commit e63ac9ac9e
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
servers/slapd/back-bdb/config.c
View file

@ -633,8 +633,9 @@ bdb_cf_gen( ConfigArgs *c )
}
ch_free( testpath );
if ( !f ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), "invalid path: %s", strerror( errno ));
Debug( LDAP_DEBUG_ANY, "%s: %s\n", c->log, c->cr_msg, 0 );
snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s: invalid path: %s",
c->log, strerror( errno ));
Debug( LDAP_DEBUG_ANY, "%s\n", c->cr_msg, 0, 0 );
return -1;
}

2
servers/slapd/bconfig.c
View file

@ -4826,6 +4826,7 @@ config_modify_internal( CfEntryInfo *ce, Operation *op, SlapReply *rs,
out:
/* Undo for a failed operation */
if ( rc != LDAP_SUCCESS ) {
ConfigReply msg = ca->reply;
for ( s = save_attrs; s; s = s->a_next ) {
if ( s->a_flags & SLAP_ATTR_IXDEL ) {
s->a_flags &= ~(SLAP_ATTR_IXDEL|SLAP_ATTR_IXADD);
@ -4862,6 +4863,7 @@ out:
}
}
}
ca->reply = msg;
}
if ( ca->cleanup )