/* $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
*/
/* Portions
#include "ldap-int.h"
-#define DN_TYPE_LDAP_RDN 0
-#define DN_TYPE_LDAP_DN 1
-#define DN_TYPE_DCE_DN 2
+#define NAME_TYPE_LDAP_RDN 0
+#define NAME_TYPE_LDAP_DN 1
+#define NAME_TYPE_DCE_DN 2
-static char **explode_name( const char *name, int notypes, int is_dn );
+static char **explode_name( const char *name, int notypes, int is_type );
char *
ldap_get_dn( LDAP *ld, LDAPMessage *entry )
return NULL;
}
- if ( ldap_is_dns_dn( dn ) ||
- ( p = strchr( dn, '=' ) ) == NULL )
- {
+ if ( ( p = ldap_utf8_strpbrk( dn, "=" ) ) == NULL ) {
return( LDAP_STRDUP( dn ) );
}
-
-
ufn = LDAP_STRDUP( ++p );
+ if( ufn == NULL ) return NULL;
+
#define INQUOTE 1
#define OUTQUOTE 2
state = OUTQUOTE;
- for ( p = ufn, r = ufn; *p; p++ ) {
+ for ( p = ufn, r = ufn; *p; LDAP_UTF8_INCR(p) ) {
switch ( *p ) {
case '\\':
- if ( *++p == '\0' )
- p--;
- else {
+ if ( p[1] != '\0' ) {
*r++ = '\\';
- *r++ = *p;
+ LDAP_UTF8_COPY(r,++p);
+ LDAP_UTF8_INCR(r);
}
break;
+
case '"':
if ( state == INQUOTE )
state = OUTQUOTE;
state = INQUOTE;
*r++ = *p;
break;
+
case ';':
case ',':
if ( state == OUTQUOTE )
else
*r++ = *p;
break;
+
case '=':
- if ( state == INQUOTE )
+ if ( state == INQUOTE ) {
*r++ = *p;
- else {
+ } else {
char *rsave = r;
- *r-- = '\0';
- while ( !isspace( (unsigned char) *r )
+ *r = '\0';
+ LDAP_UTF8_DECR( r );
+
+ while ( !ldap_utf8_isspace( r )
&& *r != ';' && *r != ',' && r > ufn )
- r--;
- r++;
+ {
+ LDAP_UTF8_DECR( r );
+ }
+ LDAP_UTF8_INCR( r );
if ( strcasecmp( r, "c" )
&& strcasecmp( r, "o" )
}
}
break;
+
default:
- *r++ = *p;
+ LDAP_UTF8_COPY(r, p);
+ LDAP_UTF8_INCR(r);
break;
}
}
return( ufn );
}
-char **
-ldap_explode_dns( LDAP_CONST char *dn_in )
-{
- char *s;
- char **rdns;
- char *tok_r;
- char *dn;
-
- int ncomps;
- int maxcomps = 8;
-
- if ( (dn = LDAP_STRDUP( dn_in )) == NULL ) {
- return( NULL );
- }
-
- if ( (rdns = (char **) LDAP_MALLOC( maxcomps * sizeof(char *) )) == NULL ) {
- LDAP_FREE( dn );
- return( NULL );
- }
-
- ncomps = 0;
- for ( s = ldap_pvt_strtok( dn, "@.", &tok_r ); s != NULL;
- s = ldap_pvt_strtok( NULL, "@.", &tok_r ) )
- {
- if ( ncomps == maxcomps ) {
- maxcomps *= 2;
- if ( (rdns = (char **) LDAP_REALLOC( rdns, maxcomps *
- sizeof(char *) )) == NULL )
- {
- LDAP_FREE( dn );
- return NULL;
- }
- }
- rdns[ncomps++] = LDAP_STRDUP( s );
- }
- LDAP_FREE(dn);
-
- rdns[ncomps] = NULL;
-
- /* trim rdns */
- rdns = (char **) LDAP_REALLOC( rdns, (ncomps+1) * sizeof(char*) );
- return( rdns );
-}
-
char **
ldap_explode_dn( LDAP_CONST char *dn, int notypes )
{
Debug( LDAP_DEBUG_TRACE, "ldap_explode_dn\n", 0, 0, 0 );
- if ( ldap_is_dns_dn( dn ) ) {
- return( ldap_explode_dns( dn ) );
- }
- return explode_name( dn, notypes, DN_TYPE_LDAP_DN );
+ return explode_name( dn, notypes, NAME_TYPE_LDAP_DN );
}
char **
ldap_explode_rdn( LDAP_CONST char *rdn, int notypes )
{
Debug( LDAP_DEBUG_TRACE, "ldap_explode_rdn\n", 0, 0, 0 );
- return explode_name( rdn, notypes, DN_TYPE_LDAP_RDN );
+ return explode_name( rdn, notypes, NAME_TYPE_LDAP_RDN );
}
char *
Debug( LDAP_DEBUG_TRACE, "ldap_dn2dcedn\n", 0, 0, 0 );
- rdns = explode_name( dn, 0, DN_TYPE_LDAP_DN );
+ rdns = explode_name( dn, 0, NAME_TYPE_LDAP_DN );
if ( rdns == NULL ) {
return NULL;
}
Debug( LDAP_DEBUG_TRACE, "ldap_dcedn2dn\n", 0, 0, 0 );
- rdns = explode_name( dce, 0, DN_TYPE_DCE_DN );
+ rdns = explode_name( dce, 0, NAME_TYPE_DCE_DN );
if ( rdns == NULL ) {
return NULL;
}
}
static char **
-explode_name( const char *name, int notypes, int is_dn )
+explode_name( const char *name, int notypes, int is_type )
{
- const char *p, *q;
+ const char *p, *q, *rdn;
char **parts = NULL;
- int state, count = 0, endquote, len;
+ int offset, state, have_equals, count = 0, endquote, len;
+
+ /* safe guard */
+ if(name == NULL) name = "";
+
+ /* skip leading whitespace */
+ while( ldap_utf8_isspace( name )) {
+ LDAP_UTF8_INCR( name );
+ }
- p = name-1;
+ p = rdn = name;
+ offset = 0;
state = OUTQUOTE;
+ have_equals=0;
do {
+ /* step forward */
+ p += offset;
+ offset = 1;
- ++p;
switch ( *p ) {
case '\\':
- if ( *++p == '\0' )
- p--;
+ if ( p[1] != '\0' ) {
+ offset = LDAP_UTF8_OFFSET(++p);
+ }
break;
case '"':
if ( state == INQUOTE )
else
state = INQUOTE;
break;
+ case '=':
+ if( state == OUTQUOTE ) have_equals++;
+ break;
case '+':
- if (is_dn == DN_TYPE_LDAP_RDN)
+ if (is_type == NAME_TYPE_LDAP_RDN)
goto end_part;
break;
case '/':
- if (is_dn == DN_TYPE_DCE_DN)
+ if (is_type == NAME_TYPE_DCE_DN)
goto end_part;
break;
case ';':
case ',':
- if (is_dn == DN_TYPE_LDAP_DN)
+ if (is_type == NAME_TYPE_LDAP_DN)
goto end_part;
break;
case '\0':
end_part:
if ( state == OUTQUOTE ) {
++count;
+ have_equals=0;
+
if ( parts == NULL ) {
if (( parts = (char **)LDAP_MALLOC( 8
* sizeof( char *))) == NULL )
== NULL )
return( NULL );
}
+
parts[ count ] = NULL;
endquote = 0;
+
if ( notypes ) {
- for ( q = name;
- q < p && *q != '='; ++q ) {
- ;
+ for ( q = rdn; q < p && *q != '='; ++q ) {
+ /* EMPTY */;
}
+
if ( q < p ) {
- name = ++q;
+ rdn = ++q;
}
- if ( *name == '"' ) {
- ++name;
+
+ if ( *rdn == '"' ) {
+ ++rdn;
}
- if ( *(p-1) == '"' ) {
+ if ( p[-1] == '"' ) {
endquote = 1;
--p;
}
}
- len = p - name;
+ len = p - rdn;
+
if (( parts[ count-1 ] = (char *)LDAP_CALLOC( 1,
- len + 1 )) != NULL ) {
- SAFEMEMCPY( parts[ count-1 ], name,
- len );
+ len + 1 )) != NULL )
+ {
+ SAFEMEMCPY( parts[ count-1 ], rdn, len );
+
+ if( !endquote ) {
+ /* skip trailing spaces */
+ while( len > 0 && ldap_utf8_isspace(
+ &parts[count-1][len-1] ) )
+ {
+ --len;
+ }
+ }
+
parts[ count-1 ][ len ] = '\0';
}
if ( endquote == 1 )
p++;
- name = *p ? p + 1 : p;
- while ( isascii( *name ) && isspace( *name ) )
- ++name;
- }
- break;
+ rdn = *p ? &p[1] : p;
+ while ( ldap_utf8_isspace( rdn ) )
+ ++rdn;
+ } break;
}
} while ( *p );
return( parts );
}
-
-
-int
-ldap_is_dns_dn( LDAP_CONST char *dn )
-{
- return( dn[ 0 ] != '\0'
- && strchr( dn, '=' ) == NULL
- && strchr( dn, ',' ) == NULL
- && strchr( dn, ';' ) == NULL );
-}
-
projects / openldap / blobdiff