ITS#7935 fix schema RDN normalization

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index d03b1e3de2ee303612eea562ee88300bee5e8735..ed52fc02b00d2d980a9136eb9dd3af0216764cf1 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -392,7 +392,9 @@ slap_modrdn2mods(
        LDAPRDN         new_rdn = NULL;
 
        assert( !BER_BVISEMPTY( &op->oq_modrdn.rs_newrdn ) );
-       assert( !op->orr_deleteoldrdn || !BER_BVISEMPTY( &op->o_req_dn ) );
+
+       /* if requestDN is empty, silently reset deleteOldRDN */
+       if ( BER_BVISEMPTY( &op->o_req_dn ) ) op->orr_deleteoldrdn = 0;
 
        if ( ldap_bv2rdn_x( &op->oq_modrdn.rs_newrdn, &new_rdn,
                (char **)&rs->sr_text, LDAP_DN_FORMAT_LDAP, op->o_tmpmemctx ) ) {
@@ -401,7 +403,7 @@ slap_modrdn2mods(
                        "type(s)/value(s) of newrdn\n",
                        op->o_log_prefix, 0, 0 );
                rs->sr_err = LDAP_INVALID_DN_SYNTAX;
-               rs->sr_text = "unknown type(s) used in RDN";
+               rs->sr_text = "unknown type(s)/value(s) used in RDN";
                goto done;
        }
 
@@ -430,11 +432,22 @@ slap_modrdn2mods(
                        Debug( LDAP_DEBUG_TRACE,
                                "%s slap_modrdn2mods: %s: %s (new)\n",
                                op->o_log_prefix,
-                               rs->sr_text, 
+                               rs->sr_text,
                                new_rdn[ a_cnt ]->la_attr.bv_val );
                        goto done;              
                }
 
+               if ( !desc->ad_type->sat_equality ) {
+                       Debug( LDAP_DEBUG_TRACE,
+                               "%s slap_modrdn2mods: %s: %s (new)\n",
+                               op->o_log_prefix,
+                               rs->sr_text,
+                               new_rdn[ a_cnt ]->la_attr.bv_val );
+                       rs->sr_text = "naming attribute has no equality matching rule";
+                       rs->sr_err = LDAP_NAMING_VIOLATION;
+                       goto done;
+               }
+
                /* Apply modification */
                mod_tmp = ( Modifications * )ch_malloc( sizeof( Modifications ) );
                mod_tmp->sml_desc = desc;
@@ -445,12 +458,19 @@ slap_modrdn2mods(
                mod_tmp->sml_values[1].bv_val = NULL;
                if( desc->ad_type->sat_equality->smr_normalize) {
                        mod_tmp->sml_nvalues = ( BerVarray )ch_malloc( 2 * sizeof( struct berval ) );
-                       (void) (*desc->ad_type->sat_equality->smr_normalize)(
+                       rs->sr_err = desc->ad_type->sat_equality->smr_normalize(
                                SLAP_MR_EQUALITY|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
                                desc->ad_type->sat_syntax,
                                desc->ad_type->sat_equality,
                                &mod_tmp->sml_values[0],
                                &mod_tmp->sml_nvalues[0], NULL );
+                       if (rs->sr_err != LDAP_SUCCESS) {
+                               ch_free(mod_tmp->sml_nvalues);
+                               ch_free(mod_tmp->sml_values[0].bv_val);
+                               ch_free(mod_tmp->sml_values);
+                               ch_free(mod_tmp);
+                               goto done;
+                       }
                        mod_tmp->sml_nvalues[1].bv_val = NULL;
                } else {
                        mod_tmp->sml_nvalues = NULL;