#include "slap.h"
-typedef enum DnState {
- B4TYPE, /* before attribute type */
- INTYPE, /* in attribute type */
- B4EQUAL, /* before '=' */
- B4VALUE, /* before attribute value */
- INVALUE, /* in attribute value */
- INQUOTEDVALUE, /* in "" in attribute value */
- B4SEPARATOR, /* before separator ('+', ',' or ';') */
-} DnState;
+#define B4LEADTYPE 0
+#define B4TYPE 1
+#define INOIDTYPE 2
+#define INKEYTYPE 3
+#define B4EQUAL 4
+#define B4VALUE 5
+#define INVALUE 6
+#define INQUOTEDVALUE 7
+#define B4SEPARATOR 8
/*
- * dn_normalize_internal - put dn into a canonical form suitable for storing
- * in a hash database. If correct_case == 1, this involves normalizing the case
- * as well as the format. The dn is normalized in place as well as returned.
- *
- * The dn_normalize() and dn_normalize_case() macros use this function.
+ * dn_normalize - put dn into a canonical format. the dn is
+ * normalized in place, as well as returned if valid.
*/
char *
-dn_normalize_internal( char *dn, int correct_case )
+dn_normalize( char *dn )
{
- char *s, *d; /* source and destination pointers */
- char *type; /* start of attr.type when state==INTYPE */
- int gotesc; /* last char was '\\' */
- int ic; /* ignore case */
- DnState state;
-
- /* Debug( LDAP_DEBUG_TRACE, "=> dn_normalize \"%s\"\n", dn, 0, 0 ); */
+ char *d, *s;
+ int state, gotesc;
gotesc = 0;
- state = B4TYPE;
+ state = B4LEADTYPE;
for ( d = s = dn; *s; s++ ) {
switch ( state ) {
+ case B4LEADTYPE:
case B4TYPE:
- if ( ! SPACE( *s ) ) {
- state = INTYPE;
- ic = 1;
- type = d;
- *d++ = TOUPPER( (unsigned char) *s );
+ if ( LEADOIDCHAR(*s) ) {
+ state = INOIDTYPE;
+ *d++ = *s;
+ } else if ( LEADKEYCHAR(*s) ) {
+ state = INKEYTYPE;
+ *d++ = *s;
+ } else if ( ! SPACE( *s ) ) {
+ dn = NULL;
+ state = INKEYTYPE;
+ *d++ = *s;
}
break;
- case INTYPE:
- if ( *s == '=' ) {
+
+ case INOIDTYPE:
+ if ( OIDCHAR(*s) ) {
+ *d++ = *s;
+ } else if ( *s == '=' ) {
state = B4VALUE;
+ *d++ = *s;
} else if ( SPACE( *s ) ) {
state = B4EQUAL;
} else {
- *d++ = TOUPPER( (unsigned char) *s );
- break;
+ dn = NULL;
+ *d++ = *s;
}
- /* Check if case is ignored in this type */
- if ( correct_case ) {
- *d = '\0';
- if ( ! (attr_syntax( type ) | SYNTAX_CIS) )
- ic = 0;
+ break;
+
+ case INKEYTYPE:
+ if ( KEYCHAR(*s) ) {
+ *d++ = *s;
+ } else if ( *s == '=' ) {
+ state = B4VALUE;
+ *d++ = *s;
+ } else if ( SPACE( *s ) ) {
+ state = B4EQUAL;
+ } else {
+ dn = NULL;
+ *d++ = *s;
}
- if (state == B4VALUE)
- *d++ = '=';
break;
+
case B4EQUAL:
if ( *s == '=' ) {
state = B4VALUE;
*d++ = *s;
} else if ( ! SPACE( *s ) ) {
/* not a valid dn - but what can we do here? */
- *d++ = TOUPPER( (unsigned char) *s );
+ *d++ = *s;
+ dn = NULL;
}
break;
+
case B4VALUE:
if ( *s == '"' ) {
state = INQUOTEDVALUE;
*d++ = *s;
} else if ( ! SPACE( *s ) ) {
state = INVALUE;
- *d++ = (ic ? TOUPPER((unsigned char) *s) : *s);
+ *d++ = *s;
}
break;
+
case INVALUE:
if ( !gotesc && SEPARATOR( *s ) ) {
while ( SPACE( *(d - 1) ) )
}
} else if ( gotesc && !NEEDSESCAPE( *s ) &&
!SEPARATOR( *s ) ) {
- *--d = (ic ? TOUPPER((unsigned char) *s) : *s);
+ *--d = *s;
d++;
} else {
- *d++ = (ic ? TOUPPER((unsigned char) *s) : *s);
+ *d++ = *s;
}
break;
+
case INQUOTEDVALUE:
if ( !gotesc && *s == '"' ) {
state = B4SEPARATOR;
*d++ = *s;
} else if ( gotesc && !NEEDSESCAPE( *s ) ) {
- *--d = (ic ? TOUPPER((unsigned char) *s) : *s);
+ *--d = *s;
d++;
} else {
- *d++ = (ic ? TOUPPER((unsigned char) *s) : *s);
+ *d++ = *s;
}
break;
case B4SEPARATOR:
}
break;
default:
+ dn = NULL;
Debug( LDAP_DEBUG_ANY,
"dn_normalize - unknown state %d\n", state, 0, 0 );
break;
}
*d = '\0';
- /* Debug( LDAP_DEBUG_TRACE, "<= dn_normalize \"%s\"\n", dn, 0, 0 ); */
+ if( gotesc ) {
+ /* shouldn't be left in escape */
+ dn = NULL;
+ }
+
+ /* check end state */
+ switch( state ) {
+ case B4LEADTYPE: /* looking for first type */
+ case B4SEPARATOR: /* looking for separator */
+ case INVALUE: /* inside value */
+ break;
+ default:
+ dn = NULL;
+ }
+
return( dn );
}
-
/*
- * dn_casecmp - compare two DNs after normalizing (private copies of) them
+ * dn_normalize_case - 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.
*/
-int
-dn_casecmp( const char *dn1, const char *dn2 )
+char *
+dn_normalize_case( char *dn )
{
- char *ndn1 = dn_normalize_case( ch_strdup( dn1 ) );
- char *ndn2 = dn_normalize_case( ch_strdup( dn2 ) );
- int i = strcmp( ndn1, ndn2 );
- free( ndn1 );
- free( ndn2 );
- return i;
-}
+ str2upper( dn );
+ /* normalize format */
+ dn = dn_normalize( dn );
+
+ /* and upper case it */
+ return( dn );
+}
/*
* dn_parent - return a copy of the dn of dn's parent
return( NULL );
}
- if ( be_issuffix( be, dn ) ) {
+ if ( be != NULL && be_issuffix( be, dn ) ) {
return( NULL );
}
return( NULL );
}
- if ( be_issuffix( be, dn ) ) {
+ if ( be != NULL && be_issuffix( be, dn ) ) {
return( NULL );
}
dn = ch_strdup( dn );
+#ifdef DNS_DN
/*
* no =, assume it is a dns name, like blah@some.domain.name
* if the blah@ part is there, return some.domain.name. if
*s = '\0';
return( dn );
}
+#endif
/*
* else assume it is an X.500-style name, which looks like
return( strcmp( dn + dnlen - suffixlen, suffix ) == 0 );
}
+#ifdef DNS_DN
/*
* dn_type - tells whether the given dn is an X.500 thing or DNS thing
* returns (defined in slap.h): DN_DNS dns-style thing
{
return( strchr( dn, '=' ) == NULL ? DN_DNS : DN_X500 );
}
+#endif
char *
-dn_upcase( char *dn )
+str2upper( char *str )
{
char *s;
/* normalize case */
- for ( s = dn; *s; s++ ) {
+ for ( s = str; *s; s++ ) {
*s = TOUPPER( (unsigned char) *s );
}
- return( dn );
+ return( str );
+}
+
+char *
+str2lower( char *str )
+{
+ char *s;
+
+ /* normalize case */
+ for ( s = str; *s; s++ ) {
+ *s = TOLOWER( (unsigned char) *s );
+ }
+
+ return( str );
}
s++;
- }/* while ( *s && SPACE(*s) ) */
+ }
/* Copy word */
*str++ = *s++;
- }/* while ( *s && (*s != d) ) */
+ }
*str = '\0';
return r;
-}/* char * get_word() */
+}
/* rdn_attr_type:
return get_next_substring( s, '=' );
-}/* char * rdn_attr_type() */
+}
/* rdn_attr_value:
return get_next_substring(++str, '\0');
- }/* if ( (str = strpbrk( rdn, "=" )) != NULL ) */
+ }
return NULL;
-}/* char * rdn_attr_value() */
+}
+
+
+int rdn_validate( const char * rdn )
+{
+ /* just a simple check for now */
+ return strchr( rdn, '=' ) != NULL;
+}
/* build_new_dn:
*new_dn = (char *) ch_malloc( strlen( p_dn ) + strlen( newrdn ) + 3 );
+#ifdef DNS_DN
if ( dn_type( e_dn ) == DN_X500 ) {
+#endif
strcpy( *new_dn, newrdn );
strcat( *new_dn, "," );
strcat( *new_dn, p_dn );
+#ifdef DNS_DN
} else {
char *s;
sep[1] = '\0';
strcat( *new_dn, sep );
- }/* if ( (s = strpbrk( dn, ".@" )) != NULL ) */
+ }
- }/* if ( *s != '.' && *s != '@' ) */
+ }
strcat( *new_dn, p_dn );
- }/* if ( dn_type( e_dn ) == DN_X500 ) {}else */
+ }
+#endif
-}/* void build_new_dn() */
+}