Move backend_syncfreq code down into back-ldbm. Creates new configuration

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 8ae52ec09569cea7da6ebc03f061910b7e2b4f5a..08cda568fa7072cd43aa37cfbe73721dc0644811 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -28,6 +28,8 @@
 #define INQUOTEDVALUE  7
 #define B4SEPARATOR            8
 
+#define UTF8DN 1
+
 /*
  * dn_validate - validate and compress dn.  the dn is
  * compressed in place are returned if valid.
@@ -150,8 +152,14 @@ dn_validate( char *dn_in )
 
                default:
                        dn = NULL;
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                                  "dn_validate: unknown state %d for dn \"%s\".\n",
+                                  state, dn_in ));
+#else
                        Debug( LDAP_DEBUG_ANY,
                            "dn_validate - unknown state %d\n", state, 0, 0 );
+#endif
                        break;
                }
 
@@ -188,20 +196,38 @@ dn_validate( char *dn_in )
 
 /*
  * dn_normalize - put dn into a canonical form suitable for storing
- * in a hash database.  this involves normalizing the case as well as
- * the format.  the dn is normalized in place as well as returned if valid.
+ * in a hash database. this involves normalizing the case as well as
+ * the format. the dn is normalized in place as well as returned if valid.
  */
 
 char *
 dn_normalize( char *dn )
 {
+       char *out;
        /* upper case it */
+#ifndef UTF8DN
        ldap_pvt_str2upper( dn );
-
        /* validate and compress dn */
-       dn = dn_validate( dn );
+       out = dn_validate( dn );
+#else
+       /* enabling this might require reindexing */
+       struct berval *bvdn, *nbvdn;
 
-       return( dn );
+       out = NULL;
+       bvdn = ber_bvstr( dn );
+       
+       if ( dnNormalize( NULL, bvdn, &nbvdn ) == LDAP_SUCCESS ) {
+               if ( nbvdn->bv_len <= bvdn->bv_len ) {
+                       out = dn;
+                       strcpy( out, nbvdn->bv_val );
+               }
+               ber_bvfree( nbvdn );
+       }
+       bvdn->bv_val = NULL; /* prevent bvfree from freeing dn */
+       ber_bvfree( bvdn );
+#endif
+
+       return( out );
 }
 
 /*