Use the macro UTF8DN to set whether new UTF8 dn_normalize() code should

be used.

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index e5733c968a86617236bf0b5878c13845ecabd1c7..357b35e9fb23d75a065f99b129b11a76672542b4 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -28,6 +28,8 @@
 #define INQUOTEDVALUE  7
 #define B4SEPARATOR            8
 
+
+#ifdef UTF8DN
 /*
  * Upper cases a UTF8 character. We cheat a bit, we only change to upper
  * if the byte length is preserved. Should be replaced.
@@ -108,6 +110,7 @@ UTF8touppercheat( unsigned char *p )
 
        return len;
 }
+#endif
 
 /*
  * dn_validate - validate and compress dn.  the dn is
@@ -277,7 +280,7 @@ char *
 dn_normalize( char *dn )
 {
        /* upper case it */
-#if 1
+#ifndef UTF8DN
        ldap_pvt_str2upper( dn );
 #else
        /* enabling this might require reindexing */