From: Howard Chu <hyc@openldap.org>
Date: Fri, 11 Oct 2002 17:12:56 +0000 (+0000)
Subject: More fixes for ITS#2136, make sure all error returns set *text.
X-Git-Tag: NO_SLAP_OP_BLOCKS~890
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9d2a8ba1b421e9bcbd968fbbab7081e775493a6d;p=openldap

More fixes for ITS#2136, make sure all error returns set *text.
---

diff --git a/servers/slapd/mods.c b/servers/slapd/mods.c
index 57ebd9ad8b..403ee8e9bd 100644
--- a/servers/slapd/mods.c
+++ b/servers/slapd/mods.c
@@ -119,10 +119,15 @@ modify_check_duplicates(
 					mr, &nmods[ i ], &nvals[ j ] );
 				if ( rc != LDAP_SUCCESS ) {
 					nmods[ i + 1 ].bv_val = NULL;
+					*text = textbuf;
+					snprintf( textbuf, textlen,
+						"%s: matching rule failed",
+						ad->ad_cname.bv_val );
 					goto return_results;
 				}
 	
 				if ( match == 0 ) {
+					*text = textbuf;
 					snprintf( textbuf, textlen,
 						"%s: value #%d provided more than once",
 						ad->ad_cname.bv_val, i );
@@ -142,10 +147,15 @@ modify_check_duplicates(
 				mr, &nmods[ i ], &nmods[ j ] );
 			if ( rc != LDAP_SUCCESS ) {
 				nmods[ i + 1 ].bv_val = NULL;
+				*text = textbuf;
+				snprintf( textbuf, textlen,
+					"%s: matching rule failed",
+					ad->ad_cname.bv_val );
 				goto return_results;
 			}
 
 			if ( match == 0 ) {
+				*text = textbuf;
 				snprintf( textbuf, textlen,
 					"%s: value #%d provided more than once",
 					ad->ad_cname.bv_val, j );
@@ -183,10 +193,15 @@ modify_check_duplicates(
 					ad->ad_type->sat_syntax,
 					mr, &nmods[ i ], &asserted );
 				if ( rc != LDAP_SUCCESS ) {
+					*text = textbuf;
+					snprintf( textbuf, textlen,
+						"%s: matching rule failed",
+						ad->ad_cname.bv_val );
 					goto return_results;
 				}
 
 				if ( match == 0 ) {
+					*text = textbuf;
 					snprintf( textbuf, textlen,
 						"%s: value #%d provided more than once",
 						ad->ad_cname.bv_val, j );
@@ -331,6 +346,10 @@ modify_add_values(
 
 					if( rc == LDAP_SUCCESS && match == 0 ) {
 						free( asserted.bv_val );
+						*text = textbuf;
+						snprintf( textbuf, textlen,
+							"modify/%s: %s: value #0 already exists",
+							op, mod->sm_desc->ad_cname.bv_val, 0 );
 						return LDAP_TYPE_OR_VALUE_EXISTS;
 					}
 				}
@@ -451,6 +470,10 @@ modify_delete_values(
 
 			if ( rc != LDAP_SUCCESS ) {
 				free( asserted.bv_val );
+				*text = textbuf;
+				snprintf( textbuf, textlen,
+					"%s: matching rule failed",
+					mod->sm_desc->ad_cname.bv_val );
 				goto return_results;
 			}