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

Fix error text handling

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-05-28 22:38:21 +00:00
parent 3350957674
commit 13daacdbda
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/slapd/back-ldbm/add.c
View File

@ -29,7 +29,7 @@ ldbm_back_add(
Entry *p = NULL; Entry *p = NULL;
int rootlock = 0; int rootlock = 0;
int rc; int rc;
const char *text; const char *text = NULL;
#ifdef SLAPD_SCHEMA_NOT_COMPAT #ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *children = slap_schema.si_ad_children; AttributeDescription *children = slap_schema.si_ad_children;
#else #else

15
servers/slapd/back-ldbm/modify.c
View File

@ -42,6 +42,8 @@ int ldbm_modify_internal(
Modifications *ml; Modifications *ml;
Attribute *save_attrs; Attribute *save_attrs;
Debug(LDAP_DEBUG_TRACE, "ldbm_modify_internal:\n", 0, 0, 0);
if ( !acl_check_modlist( be, conn, op, e, modlist )) { if ( !acl_check_modlist( be, conn, op, e, modlist )) {
return LDAP_INSUFFICIENT_ACCESS; return LDAP_INSUFFICIENT_ACCESS;
} }
@ -54,6 +56,7 @@ int ldbm_modify_internal(
switch ( mod->sm_op ) { switch ( mod->sm_op ) {
case LDAP_MOD_ADD: case LDAP_MOD_ADD:
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: add\n", 0, 0, 0);
err = add_values( e, mod, op->o_ndn ); err = add_values( e, mod, op->o_ndn );
if( err != LDAP_SUCCESS ) { if( err != LDAP_SUCCESS ) {
@ -62,6 +65,7 @@ int ldbm_modify_internal(
break; break;
case LDAP_MOD_DELETE: case LDAP_MOD_DELETE:
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: delete\n", 0, 0, 0);
err = delete_values( e, mod, op->o_ndn ); err = delete_values( e, mod, op->o_ndn );
assert( err != LDAP_TYPE_OR_VALUE_EXISTS ); assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
if( err != LDAP_SUCCESS ) { if( err != LDAP_SUCCESS ) {
@ -70,6 +74,7 @@ int ldbm_modify_internal(
break; break;
case LDAP_MOD_REPLACE: case LDAP_MOD_REPLACE:
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: replace\n", 0, 0, 0);
err = replace_values( e, mod, op->o_ndn ); err = replace_values( e, mod, op->o_ndn );
assert( err != LDAP_TYPE_OR_VALUE_EXISTS ); assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
if( err != LDAP_SUCCESS ) { if( err != LDAP_SUCCESS ) {
@ -78,6 +83,7 @@ int ldbm_modify_internal(
break; break;
case SLAP_MOD_SOFTADD: case SLAP_MOD_SOFTADD:
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: softadd\n", 0, 0, 0);
/* Avoid problems in index_add_mods() /* Avoid problems in index_add_mods()
* We need to add index if necessary. * We need to add index if necessary.
*/ */
@ -94,6 +100,9 @@ int ldbm_modify_internal(
break; break;
default: default:
Debug(LDAP_DEBUG_ANY, "ldbm_modify_internal: invalid op %d\n",
mod->sm_op, 0, 0);
*text = "Invalid modify operation";
err = LDAP_OTHER; err = LDAP_OTHER;
} }
@ -234,7 +243,7 @@ ldbm_back_modify(
Entry *matched; Entry *matched;
Entry *e; Entry *e;
int manageDSAit = get_manageDSAit( op ); int manageDSAit = get_manageDSAit( op );
const char *text; const char *text = NULL;
Debug(LDAP_DEBUG_ARGS, "ldbm_back_modify:\n", 0, 0, 0); Debug(LDAP_DEBUG_ARGS, "ldbm_back_modify:\n", 0, 0, 0);
@ -296,7 +305,7 @@ ldbm_back_modify(
/* change the entry itself */ /* change the entry itself */
if ( id2entry_add( be, e ) != 0 ) { if ( id2entry_add( be, e ) != 0 ) {
send_ldap_result( conn, op, LDAP_OTHER, send_ldap_result( conn, op, LDAP_OTHER,
NULL, NULL, NULL, NULL ); NULL, "id2entry failure", NULL, NULL );
goto error_return; goto error_return;
} }
@ -388,7 +397,7 @@ delete_values(
for ( j = 0; a->a_vals[j] != NULL; j++ ) { for ( j = 0; a->a_vals[j] != NULL; j++ ) {
#ifdef SLAPD_SCHEMA_NOT_COMPAT #ifdef SLAPD_SCHEMA_NOT_COMPAT
int match; int match;
const char *text; const char *text = NULL;
int rc = value_match( &match, mod->sm_desc, int rc = value_match( &match, mod->sm_desc,
mod->sm_desc->ad_type->sat_equality, mod->sm_desc->ad_type->sat_equality,
mod->sm_bvalues[i], a->a_vals[j], &text ); mod->sm_bvalues[i], a->a_vals[j], &text );

2
servers/slapd/back-ldbm/modrdn.c
View File

@ -56,7 +56,7 @@ ldbm_back_modrdn(
Entry *matched; Entry *matched;
int rootlock = 0; int rootlock = 0;
int rc = -1; int rc = -1;
const char *text; const char *text = NULL;
/* Added to support LDAP v2 correctly (deleteoldrdn thing) */ /* Added to support LDAP v2 correctly (deleteoldrdn thing) */
char *new_rdn_val = NULL; /* Val of new rdn */ char *new_rdn_val = NULL; /* Val of new rdn */
char *new_rdn_type = NULL; /* Type of new rdn */ char *new_rdn_type = NULL; /* Type of new rdn */

2
servers/slapd/back-ldbm/search.c
View File

@ -43,7 +43,7 @@ ldbm_back_search(
{ {
struct ldbminfo *li = (struct ldbminfo *) be->be_private; struct ldbminfo *li = (struct ldbminfo *) be->be_private;
int rc, err; int rc, err;
const char *text; const char *text = NULL;
time_t stoptime; time_t stoptime;
ID_BLOCK *candidates; ID_BLOCK *candidates;
ID id, cursor; ID id, cursor;