/* dn.c - routines for dealing with distinguished names */
+/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include <ac/string.h>
#include <ac/time.h>
+#include "ldap_pvt.h"
+
#include "slap.h"
#define B4LEADTYPE 0
#define B4SEPARATOR 8
/*
- * dn_normalize - put dn into a canonical format. the dn is
- * normalized in place, as well as returned if valid.
+ * dn_validate - validate and compress dn. the dn is
+ * compressed in place are returned if valid.
*/
char *
-dn_normalize( char *dn )
+dn_validate( char *dn )
{
char *d, *s;
int state, gotesc;
switch ( state ) {
case B4LEADTYPE:
case B4TYPE:
- if ( LEADOIDCHAR(*s) ) {
+ if ( OID_LEADCHAR(*s) ) {
state = INOIDTYPE;
*d++ = *s;
- } else if ( LEADKEYCHAR(*s) ) {
+ } else if ( ATTR_LEADCHAR(*s) ) {
state = INKEYTYPE;
*d++ = *s;
- } else if ( ! SPACE( *s ) ) {
+ } else if ( ! ASCII_SPACE( *s ) ) {
dn = NULL;
state = INKEYTYPE;
*d++ = *s;
break;
case INOIDTYPE:
- if ( OIDCHAR(*s) ) {
+ if ( OID_CHAR(*s) ) {
*d++ = *s;
} else if ( *s == '=' ) {
state = B4VALUE;
*d++ = *s;
- } else if ( SPACE( *s ) ) {
+ } else if ( ASCII_SPACE( *s ) ) {
state = B4EQUAL;
} else {
dn = NULL;
break;
case INKEYTYPE:
- if ( KEYCHAR(*s) ) {
+ if ( ATTR_CHAR(*s) ) {
*d++ = *s;
} else if ( *s == '=' ) {
state = B4VALUE;
*d++ = *s;
- } else if ( SPACE( *s ) ) {
+ } else if ( ASCII_SPACE( *s ) ) {
state = B4EQUAL;
} else {
dn = NULL;
if ( *s == '=' ) {
state = B4VALUE;
*d++ = *s;
- } else if ( ! SPACE( *s ) ) {
+ } else if ( ! ASCII_SPACE( *s ) ) {
/* not a valid dn - but what can we do here? */
*d++ = *s;
dn = NULL;
if ( *s == '"' ) {
state = INQUOTEDVALUE;
*d++ = *s;
- } else if ( ! SPACE( *s ) ) {
+ } else if ( ! ASCII_SPACE( *s ) ) {
state = INVALUE;
*d++ = *s;
}
break;
case INVALUE:
- if ( !gotesc && SEPARATOR( *s ) ) {
- while ( SPACE( *(d - 1) ) )
+ if ( !gotesc && RDN_SEPARATOR( *s ) ) {
+ while ( ASCII_SPACE( *(d - 1) ) )
d--;
state = B4TYPE;
if ( *s == '+' ) {
} else {
*d++ = ',';
}
- } else if ( gotesc && !NEEDSESCAPE( *s ) &&
- !SEPARATOR( *s ) ) {
+ } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) &&
+ !RDN_SEPARATOR( *s ) ) {
*--d = *s;
d++;
} else {
if ( !gotesc && *s == '"' ) {
state = B4SEPARATOR;
*d++ = *s;
- } else if ( gotesc && !NEEDSESCAPE( *s ) ) {
+ } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) ) {
*--d = *s;
d++;
} else {
*d++ = *s;
}
break;
+
case B4SEPARATOR:
- if ( SEPARATOR( *s ) ) {
+ if ( RDN_SEPARATOR( *s ) ) {
state = B4TYPE;
*d++ = *s;
}
break;
+
default:
dn = NULL;
Debug( LDAP_DEBUG_ANY,
- "dn_normalize - unknown state %d\n", state, 0, 0 );
+ "dn_validate - unknown state %d\n", state, 0, 0 );
break;
}
+
if ( *s == '\\' ) {
gotesc = 1;
} else {
}
/*
- * dn_normalize_case - put dn into a canonical form suitable for storing
+ * 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.
*/
char *
-dn_normalize_case( char *dn )
+dn_normalize( char *dn )
{
- str2upper( dn );
+ /* upper case it */
+ ldap_pvt_str2upper( dn );
- /* normalize format */
- dn = dn_normalize( dn );
+ /* validate and compress dn */
+ dn = dn_validate( dn );
- /* and upper case it */
return( dn );
}
char *
dn_parent(
Backend *be,
- char *dn
+ const char *dn
)
{
- char *s;
+ const char *s;
int inquote;
if( dn == NULL ) {
return NULL;
}
- while(*dn && SPACE(*dn)) {
+ while(*dn != '\0' && ASCII_SPACE(*dn)) {
dn++;
}
}
/*
- * no =, assume it is a dns name, like blah@some.domain.name
- * if the blah@ part is there, return some.domain.name. if
- * it's just some.domain.name, return domain.name.
- */
- if ( strchr( dn, '=' ) == NULL ) {
- if ( (s = strchr( dn, '@' )) == NULL ) {
- if ( (s = strchr( dn, '.' )) == NULL ) {
- return( NULL );
- }
- }
- if ( *(s + 1) == '\0' ) {
- return( NULL );
- } else {
- return( ch_strdup( &s[1] ) );
- }
- }
-
- /*
- * else assume it is an X.500-style name, which looks like
+ * assume it is an X.500-style name, which looks like
* foo=bar,sha=baz,...
*/
} else {
if ( *s == '"' ) {
inquote = 1;
- } else if ( DNSEPARATOR( *s ) ) {
+ } else if ( DN_SEPARATOR( *s ) ) {
return( ch_strdup( &s[1] ) );
}
}
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 && 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 );
-
-#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
- * it's just some.domain.name, return domain.name.
- */
- if ( strchr( dn, '=' ) == NULL ) {
- if ( (s = strchr( dn, '@' )) == NULL ) {
- if ( (s = strchr( dn, '.' )) == NULL ) {
- return( dn );
- }
- }
- *s = '\0';
- return( dn );
- }
-#endif
-
- /*
- * else assume it is an X.500-style name, which looks like
- * foo=bar,sha=baz,...
- */
+ dn = ch_strdup( dn_in );
inquote = 0;
} else {
if ( *s == '"' ) {
inquote = 1;
- } else if ( DNSEPARATOR( *s ) ) {
+ } else if ( DN_SEPARATOR( *s ) ) {
*s = '\0';
return( dn );
}
*/
char **dn_subtree(
Backend *be,
- char *dn )
+ const char *dn )
{
- /* not yet implemented */
- return NULL;
+ char *child, *parent;
+ char **subtree = NULL;
+
+ child = ch_strdup( dn );
+
+ do {
+ charray_add( &subtree, child );
+
+ parent = dn_parent( be, child );
+
+ free( child );
+
+ child = parent;
+ } while ( child != NULL );
+
+ return subtree;
}
int
dn_issuffix(
- char *dn,
- char *suffix
+ const char *dn,
+ const char *suffix
)
{
int dnlen, suffixlen;
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
- * DN_X500 x500-style thing
- */
-
-int
-dn_type( char *dn )
-{
- return( strchr( dn, '=' ) == NULL ? DN_DNS : DN_X500 );
-}
-#endif
-
-char *
-str2upper( char *str )
-{
- char *s;
-
- /* normalize case */
- for ( s = str; *s; s++ ) {
- *s = TOUPPER( (unsigned char) *s );
- }
-
- return( str );
-}
-
-char *
-str2lower( char *str )
-{
- char *s;
-
- /* normalize case */
- for ( s = str; *s; s++ ) {
- *s = TOLOWER( (unsigned char) *s );
- }
-
- return( str );
-}
-
-
/*
* get_next_substring(), rdn_attr_type(), rdn_attr_value(), and
* build_new_dn().
*/
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 && SPACE(*s) ) {
-
+ 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;
*/
void
-build_new_dn( char ** new_dn, char *e_dn, char * p_dn, char * newrdn )
+build_new_dn( char ** new_dn,
+ const char *e_dn,
+ const char * p_dn,
+ const char * newrdn )
{
if ( p_dn == NULL ) {
-
*new_dn = ch_strdup( newrdn );
return;
-
}
*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;
- char sep[2];
-
- strcpy( *new_dn, newrdn );
- s = strchr( newrdn, '\0' );
- s--;
-
- if ( (*s != '.') && (*s != '@') ) {
-
- if ( (s = strpbrk( e_dn, ".@" )) != NULL ) {
-
- sep[0] = *s;
- sep[1] = '\0';
- strcat( *new_dn, sep );
-
- }
-
- }
-
- strcat( *new_dn, p_dn );
-
- }
-#endif
-
}
projects / openldap / blobdiff