Additional fix for ITS#4522. The "dn=" ist not optional.

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 0d0e7a27dfa4754555331662e0dc8e69598c5c22..93c27985b3cf116155dfdac3c73c83ea02f1bfb9 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -269,23 +269,14 @@ str2entry2( char *s, int checkvals )
                                ad->ad_type->sat_syntax->ssyn_pretty;
 
                        if ( pretty ) {
-#ifdef SLAP_ORDERED_PRETTYNORM
                                rc = ordered_value_pretty( ad,
                                        &vals[i], &pval, NULL );
-#else /* ! SLAP_ORDERED_PRETTYNORM */
-                               rc = pretty( ad->ad_type->sat_syntax,
-                                       &vals[i], &pval, NULL );
-#endif /* ! SLAP_ORDERED_PRETTYNORM */
 
                        } else if ( validate ) {
                                /*
                                 * validate value per syntax
                                 */
-#ifdef SLAP_ORDERED_PRETTYNORM
                                rc = ordered_value_validate( ad, &vals[i], LDAP_MOD_ADD );
-#else /* ! SLAP_ORDERED_PRETTYNORM */
-                               rc = validate( ad->ad_type->sat_syntax, &vals[i] );
-#endif /* ! SLAP_ORDERED_PRETTYNORM */
 
                        } else {
                                Debug( LDAP_DEBUG_ANY,
@@ -315,19 +306,11 @@ str2entry2( char *s, int checkvals )
                if ( ad->ad_type->sat_equality &&
                        ad->ad_type->sat_equality->smr_normalize )
                {
-#ifdef SLAP_ORDERED_PRETTYNORM
                        rc = ordered_value_normalize(
                                SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
                                ad,
                                ad->ad_type->sat_equality,
                                &vals[i], &nvals[i], NULL );
-#else /* ! SLAP_ORDERED_PRETTYNORM */
-                       rc = ad->ad_type->sat_equality->smr_normalize(
-                               SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-                               ad->ad_type->sat_syntax,
-                               ad->ad_type->sat_equality,
-                               &vals[i], &nvals[i], NULL );
-#endif /* ! SLAP_ORDERED_PRETTYNORM */
 
                        if ( rc ) {
                                Debug( LDAP_DEBUG_ANY,