mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-24 13:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix up duplicate error reporting

Browse Source
This commit is contained in:
Kurt Zeilenga 2002-01-19 02:20:46 +00:00
parent 960fa831a6
commit ccc4e64f0a
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
servers/slapd/add.c
View File

@ -29,7 +29,8 @@ static int slap_mods2entry(
Modifications *mods,
Entry **e,
int repl_user,
const char **text );
const char **text,
char *textbuf, size_t textlen );
int
do_add( Connection *conn, Operation *op )
@ -280,7 +281,8 @@ do_add( Connection *conn, Operation *op )
}
}
rc = slap_mods2entry( modlist, &e, repl_user, &text );
rc = slap_mods2entry( modlist, &e, repl_user, &text,
textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
@ -337,11 +339,14 @@ static int slap_mods2entry(
Modifications *mods,
Entry **e,
int repl_user,
const char **text )
const char **text,
char *textbuf, size_t textlen )
{
Attribute **tail = &(*e)->e_attrs;
assert( *tail == NULL );
*text = textbuf;
for( ; mods != NULL; mods = mods->sml_next ) {
Attribute *attr;
@ -356,7 +361,9 @@ static int slap_mods2entry(
ber_len_t i,j;
if( !repl_user ) {
*text = "attribute provided more than once";
snprintf( textbuf, textlen,
"attribute '%s' provided more than once",
mods->sml_desc->ad_cname.bv_val );
return LDAP_TYPE_OR_VALUE_EXISTS;
}
@ -382,7 +389,9 @@ static int slap_mods2entry(
continue;
#else
*text = "attribute provided more than once";
snprintf( textbuf, textlen,
"attribute '%s' provided more than once",
mods->sml_desc->ad_cname.bv_val );
return LDAP_TYPE_OR_VALUE_EXISTS;
#endif
}
@ -402,6 +411,9 @@ static int slap_mods2entry(
if( rc == 0 ) {
/* value exists already */
snprintf( textbuf, textlen,
"%s: value #%d provided more than once",
mods->sml_desc->ad_cname.bv_val, j );
return LDAP_TYPE_OR_VALUE_EXISTS;
}
}
@ -428,6 +440,9 @@ static int slap_mods2entry(
if( rc == LDAP_SUCCESS && match == 0 ) {
free( asserted.bv_val );
snprintf( textbuf, textlen,
"%s: value #%d provided more than once",
mods->sml_desc->ad_cname.bv_val, j );
return LDAP_TYPE_OR_VALUE_EXISTS;
}
}