X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodrdn.c;h=ed52fc02b00d2d980a9136eb9dd3af0216764cf1;hb=e7ddb6155c74b320d4714b953f2c1c7d2ab748ff;hp=cf577caa6a24e12157bd15693be61f3c8a3bb071;hpb=1509d75363bee970579392dbd763b00bcb99d41b;p=openldap

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index cf577caa6a..ed52fc02b0 100644
--- 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-2012 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -432,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;