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 a20d5a2cb5c845aff9bf52cb8487299ccc42ed61..08cda568fa7072cd43aa37cfbe73721dc0644811 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -28,16 +28,19 @@
 #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.
  */
 
 char *
-dn_validate( char *dn )
+dn_validate( char *dn_in )
 {
        char    *d, *s;
        int     state, gotesc;
+       char    *dn = dn_in;
 
        gotesc = 0;
        state = B4LEADTYPE;
@@ -121,7 +124,7 @@ dn_validate( char *dn )
                            !RDN_SEPARATOR( *s ) ) {
                                *--d = *s;
                                d++;
-                       } else {
+                       } else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(d - 1) ) ) {
                                *d++ = *s;
                        }
                        break;
@@ -133,7 +136,7 @@ dn_validate( char *dn )
                        } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) ) {
                                *--d = *s;
                                d++;
-                       } else {
+                       } else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(d - 1) ) ) {
                                *d++ = *s;
                        }
                        break;
@@ -142,13 +145,21 @@ dn_validate( char *dn )
                        if ( RDN_SEPARATOR( *s ) ) {
                                state = B4TYPE;
                                *d++ = *s;
+                       } else if ( !ASCII_SPACE( *s ) ) {
+                               dn = NULL;
                        }
                        break;
 
                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;
                }
 
@@ -158,6 +169,11 @@ dn_validate( char *dn )
                        gotesc = 0;
                }
        }
+
+       /* trim trailing spaces */
+       while( d > dn_in && ASCII_SPACE( *(d-1) ) ) {
+               --d;
+       }
        *d = '\0';
 
        if( gotesc ) {
@@ -180,20 +196,38 @@ dn_validate( char *dn )
 
 /*
  * 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 );
 }
 
 /*
@@ -218,11 +252,11 @@ dn_parent(
        }
 
        if( *dn == '\0' ) {
-               return( NULL );
+               return NULL;
        }
 
        if ( be != NULL && be_issuffix( be, dn ) ) {
-               return( NULL );
+               return NULL;
        }
 
        /*
@@ -246,12 +280,12 @@ dn_parent(
                        if ( *s == '"' ) {
                                inquote = 1;
                        } else if ( DN_SEPARATOR( *s ) ) {
-                               return( ch_strdup( &s[1] ) );
+                               return ch_strdup( &s[1] );
                        }
                }
        }
 
-       return( ch_strdup( "" ) );
+       return ch_strdup( "" );
 }
 
 char * dn_rdn(