#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;
!RDN_SEPARATOR( *s ) ) {
*--d = *s;
d++;
- } else {
+ } else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(d - 1) ) ) {
*d++ = *s;
}
break;
} else if ( gotesc && !RDN_NEEDSESCAPE( *s ) ) {
*--d = *s;
d++;
- } else {
+ } else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(d - 1) ) ) {
*d++ = *s;
}
break;
+
case B4SEPARATOR:
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;
}
+
if ( *s == '\\' ) {
gotesc = 1;
} else {
gotesc = 0;
}
}
+
+ /* trim trailing spaces */
+ while( d > dn_in && ASCII_SPACE( *(d-1) ) ) {
+ --d;
+ }
*d = '\0';
if( gotesc ) {
/*
* 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 );
}
/*
}
if( *dn == '\0' ) {
- return( NULL );
+ return NULL;
}
if ( be != NULL && be_issuffix( be, dn ) ) {
- return( NULL );
+ return NULL;
}
/*
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(
Backend *be,
- char *dn )
+ const char *dn_in )
{
- char *s;
+ char *dn, *s;
int inquote;
- if( dn == NULL ) {
+ if( dn_in == NULL ) {
return NULL;
}
- while(*dn && ASCII_SPACE(*dn)) {
- dn++;
+ while(*dn_in && ASCII_SPACE(*dn_in)) {
+ dn_in++;
}
- if( *dn == '\0' ) {
+ if( *dn_in == '\0' ) {
return( NULL );
}
- if ( be != NULL && be_issuffix( be, dn ) ) {
+ if ( be != NULL && be_issuffix( be, dn_in ) ) {
return( NULL );
}
- dn = ch_strdup( dn );
+ dn = ch_strdup( dn_in );
inquote = 0;
int
dn_issuffix(
- char *dn,
- char *suffix
+ const char *dn,
+ const char *suffix
)
{
int dnlen, suffixlen;
*/
static char *
-get_next_substring( char * s, char d )
+get_next_substring( const char * s, char d )
{
char *str, *r;
/* Skip leading spaces */
while ( *s && ASCII_SPACE(*s) ) {
-
s++;
-
}
/* Copy word */
* memory. The returned string will be null-terminated.
*/
-char * rdn_attr_type( char * s )
+char * rdn_attr_type( const char * s )
{
-
return get_next_substring( s, '=' );
-
}
*/
char *
-rdn_attr_value( char * rdn )
+rdn_attr_value( const char * rdn )
{
- char *str;
+ const char *str;
if ( (str = strchr( rdn, '=' )) != NULL ) {
-
return get_next_substring(++str, '\0');
-
}
return NULL;
{
if ( p_dn == NULL ) {
-
*new_dn = ch_strdup( newrdn );
return;
-
}
*new_dn = (char *) ch_malloc( strlen( p_dn ) + strlen( newrdn ) + 3 );