Add limited LDAP_INVALID_DN_SYNTAX support. dn_normalize{,_case}() now returns

[openldap] / servers / slapd / back-ldbm / modrdn.c

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index 1b8d49bbcaa2eeae0c6676f3684d9d8dc5da56d3..e7a7f83d0348719332e3cb8b021cf3e94b9e29b4 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -184,7 +184,8 @@ ldbm_back_modrdn(
                       "ldbm_back_modrdn: new parent requested...\n",
                       0, 0, 0 );
 
-               np_ndn = dn_normalize_case( ch_strdup( np_dn ) );
+               np_ndn = ch_strdup( np_dn );
+               (void) dn_normalize_case( np_ndn );
 
                /* newSuperior == oldParent?, if so ==> ERROR */
                /* newSuperior == entry being moved?, if so ==> ERROR */
@@ -250,7 +251,8 @@ ldbm_back_modrdn(
        build_new_dn( &new_dn, e->e_dn, new_parent_dn, newrdn ); 
 
 
-       new_ndn = dn_normalize_case( ch_strdup(new_dn) );
+       new_ndn = ch_strdup(new_dn);
+       (void) dn_normalize_case( new_ndn );
 
        Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: new ndn=%s\n",
               new_ndn, 0, 0 );
@@ -357,7 +359,9 @@ ldbm_back_modrdn(
            
        }               
 
+#ifdef DNS_DN
        if ( dn_type( old_rdn ) == DN_X500 ) {
+#endif
 
                Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DN_X500\n",
                       0, 0, 0 );
@@ -414,6 +418,7 @@ ldbm_back_modrdn(
                               old_rdn_val, 0, 0 );
                }
        
+#ifdef DNS_DN
        } else {
                Debug( LDAP_DEBUG_TRACE, "ldbm_back_modrdn: DNS DN\n",
                       0, 0, 0 );
@@ -427,6 +432,7 @@ ldbm_back_modrdn(
                goto return_results;
 
        }
+#endif
 
        /* modify memory copy of entry */
        if ( ldbm_modify_internal( be, conn, op, dn, &mod[0], e )