#define INQUOTEDVALUE 7
#define B4SEPARATOR 8
-/*
- * Upper cases a UTF8 character. We cheat a bit, we only change to upper
- * if the byte length is preserved. Should be replaced.
- */
-
-int
-UTF8touppercheat( unsigned char *p )
-{
- ldap_unicode_t u;
- int len;
-
- len = LDAP_UTF8_CHARLEN( p );
- if ( !len ) {
- return 1;
- }
-
- u = ldap_utf8_to_ucs4( p );
- if ( u == LDAP_UCS4_INVALID ) {
- return 1;
- }
-
- u = uctoupper ( u );
- if ( u < 0 ) {
- return 1;
- }
-
- if ( u < 0x80 ) {
- if ( len == 1 ) {
- p[0] = u;
- } else {
- return 1;
- }
- } else if ( u < 0x800 ) {
- if ( len == 2 ) {
- p[0] = 0xc0 | ( u >> 6 );
- p[1] = 0x80 | ( u & 0x3f );
- } else {
- return 1;
- }
- } else if ( u < 0x10000 ) {
- if ( len == 3 ) {
- p[0] = 0xe0 | ( u >> 12 );
- p[1] = 0x80 | ( (u >> 6) & 0x3f );
- p[2] = 0x80 | ( u & 0x3f );
- } else {
- return 1;
- }
- } else if ( u < 0x200000 ) {
- if ( len == 4 ) {
- p[0] = 0xf0 | ( u >> 18 );
- p[1] = 0x80 | ( (u >> 12) & 0x3f );
- p[2] = 0x80 | ( (u >> 6) & 0x3f );
- p[3] = 0x80 | ( u & 0x3f );
- } else {
- return 1;
- }
- } else if ( u < 0x4000000 ) {
- if ( len == 5 ) {
- p[0] = 0xf8 | ( u >> 24 );
- p[1] = 0x80 | ( (u >> 18) & 0x3f );
- p[2] = 0x80 | ( (u >> 12) & 0x3f );
- p[3] = 0x80 | ( (u >> 6) & 0x3f );
- p[4] = 0x80 | ( u & 0x3f );
- } else {
- return 1;
- }
- } else if ( len == 6 ) {
- /* u < 0x80000000 */
- p[0] = 0xfc | ( u >> 30 );
- p[1] = 0x80 | ( (u >> 24) & 0x3f );
- p[2] = 0x80 | ( (u >> 18) & 0x3f );
- p[3] = 0x80 | ( (u >> 12) & 0x3f );
- p[4] = 0x80 | ( (u >> 6) & 0x3f );
- p[5] = 0x80 | ( u & 0x3f );
- } else {
- return 1;
- }
-
- return len;
-}
-
/*
* dn_validate - validate and compress dn. the dn is
* compressed in place are returned if valid.
if ( *s == '"' ) {
state = INQUOTEDVALUE;
*d++ = *s;
- } else if ( ! ASCII_SPACE( *s ) ) {
+ } else if ( ! ASCII_SPACE( *s ) ) {
state = INVALUE;
*d++ = *s;
}
*d++ = ',';
}
} else if ( gotesc && !RDN_NEEDSESCAPE( *s ) &&
- !RDN_SEPARATOR( *s ) ) {
+ !RDN_SEPARATOR( *s ) )
+ {
*--d = *s;
d++;
} else if( !ASCII_SPACE( *s ) || !ASCII_SPACE( *(d - 1) ) ) {
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 );
+ "dn_validate - unknown state %d\n", state, 0, 0 );
+#endif
break;
}
/*
* 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 )
{
- /* upper case it */
-#if 1
- ldap_pvt_str2upper( dn );
-#else
- /* enabling this might require reindexing */
- char *p;
-
- p = dn;
- while ( *p ) {
- /* optimizing */
- if ( LDAP_UTF8_ISASCII(p) ) {
- *p = TOUPPER( (unsigned char) *p );
- p++;
- } else {
- p += UTF8touppercheat( p );
+ char *out;
+ struct berval *bvdn, *nbvdn;
+
+ 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 );
}
-#endif
- /* validate and compress dn */
- dn = dn_validate( dn );
+ bvdn->bv_val = NULL; /* prevent bvfree from freeing dn */
+ ber_bvfree( bvdn );
- return( dn );
+ return( out );
}
/*
char *
dn_parent(
- Backend *be,
- const char *dn
+ Backend *be,
+ const char *dn
)
{
const char *s;
return ch_strdup( "" );
}
-char * dn_rdn(
- Backend *be,
- const char *dn_in )
+char * dn_rdn(
+ Backend *be,
+ const char *dn_in )
{
char *dn, *s;
int inquote;
*/
char **dn_subtree(
Backend *be,
- const char *dn )
+ const char *dn )
{
char *child, *parent;
char **subtree = NULL;
/*
- * dn_issuffix - tells whether suffix is a suffix of dn. both dn
+ * dn_issuffix - tells whether suffix is a suffix of dn. Both dn
* and suffix must be normalized.
*/
int
dn_issuffix(
- const char *dn,
- const char *suffix
+ const char *dn,
+ const char *suffix
)
{
int dnlen, suffixlen;
/*
* get_next_substring(), rdn_attr_type(), rdn_attr_value(), and
* build_new_dn().
- *
+ *
* Copyright 1999, Juan C. Gomez, All rights reserved.
- * This software is not subject to any license of Silicon Graphics
+ * This software is not subject to any license of Silicon Graphics
* Inc. or Purdue University.
*
* Redistribution and use in source and binary forms are permitted
/* get_next_substring:
*
- * Gets next substring in s, using d (or the end of the string '\0') as a
- * string delimiter, and places it in a duplicated memory space. Leading
+ * Gets next substring in s, using d (or the end of the string '\0') as a
+ * string delimiter, and places it in a duplicated memory space. Leading
* spaces are ignored. String s **must** be null-terminated.
- */
+ */
-static char *
+static char *
get_next_substring( const char * s, char d )
{
*/
*str++ = *s++;
-
}
*str = '\0';
*
* Given a string (i.e. an rdn) of the form:
* "attribute_type = attribute_value"
- * this function returns the type of an attribute, that is the
- * string "attribute_type" which is placed in newly allocated
+ * this function returns the type of an attribute, that is the
+ * string "attribute_type" which is placed in newly allocated
* memory. The returned string will be null-terminated.
*/
*
* Given a string (i.e. an rdn) of the form:
* "attribute_type = attribute_value"
- * this function returns "attribute_type" which is placed in newly allocated
- * memory. The returned string will be null-terminated and may contain
+ * this function returns "attribute_type" which is placed in newly allocated
+ * memory. The returned string will be null-terminated and may contain
* spaces (i.e. "John Doe\0").
*/
-char *
+char *
rdn_attr_value( const char * rdn )
{
}
-int rdn_validate( const char * rdn )
+/* rdn_attrs:
+ *
+ * Given a string (i.e. an rdn) of the form:
+ * "attribute_type=attribute_value[+attribute_type=attribute_value[...]]"
+ * this function stores the types of the attributes in ptypes, that is the
+ * array of strings "attribute_type" which is placed in newly allocated
+ * memory, and the values of the attributes in pvalues, that is the
+ * array of strings "attribute_value" which is placed in newly allocated
+ * memory. Returns 0 on success, -1 on failure.
+ *
+ * note: got part of the code from dn_validate
+ */
+
+int
+rdn_attrs( const char * rdn_in, char ***ptypes, char ***pvalues)
{
- /* just a simple check for now */
- return strchr( rdn, '=' ) != NULL;
+ char **parts, **p;
+
+ *ptypes = NULL;
+ *pvalues = NULL;
+
+ /*
+ * explode the rdn in parts
+ */
+ parts = ldap_explode_rdn( rdn_in, 0 );
+
+ if ( parts == NULL ) {
+ return( -1 );
+ }
+
+ for ( p = parts; p[0]; p++ ) {
+ char *s, *e, *d;
+
+ /* split each rdn part in type value */
+ s = strchr( p[0], '=' );
+ if ( s == NULL ) {
+ charray_free( *ptypes );
+ charray_free( *pvalues );
+ charray_free( parts );
+ return( -1 );
+ }
+
+ /* type should be fine */
+ charray_add_n( ptypes, p[0], ( s-p[0] ) );
+
+ /* value needs to be unescaped
+ * (maybe this should be moved to ldap_explode_rdn?) */
+ for ( e = d = s + 1; e[0]; e++ ) {
+ if ( *e != '\\' ) {
+ *d++ = *e;
+ }
+ }
+ d[0] = '\0';
+ charray_add( pvalues, s + 1 );
+ }
+
+ /* free array */
+ charray_free( parts );
+
+ return( 0 );
+}
+
+
+/* rdn_validate:
+ *
+ * 1 if rdn is a legal rdn;
+ * 0 otherwise (including a sequence of rdns)
+ *
+ * note: got it from dn_rdn; it should be rewritten
+ * according to dn_validate
+ */
+int
+rdn_validate( const char * rdn )
+{
+ int inquote;
+
+ if ( rdn == NULL ) {
+ return( 0 );
+ }
+
+ if ( strchr( rdn, '=' ) == NULL ) {
+ return( 0 );
+ }
+
+ while ( *rdn && ASCII_SPACE( *rdn ) ) {
+ rdn++;
+ }
+
+ if( *rdn == '\0' ) {
+ return( 0 );
+ }
+
+ inquote = 0;
+
+ for ( ; *rdn; rdn++ ) {
+ if ( *rdn == '\\' ) {
+ if ( *(rdn + 1) ) {
+ rdn++;
+ }
+ continue;
+ }
+ if ( inquote ) {
+ if ( *rdn == '"' ) {
+ inquote = 0;
+ }
+ } else {
+ if ( *rdn == '"' ) {
+ inquote = 1;
+ } else if ( DN_SEPARATOR( *rdn ) ) {
+ return( 0 );
+ }
+ }
+ }
+
+ return( 1 );
}
/* build_new_dn:
*
- * Used by ldbm/bdb2_back_modrdn to create the new dn of entries being
+ * Used by ldbm/bdb2 back_modrdn to create the new dn of entries being
* renamed.
*
- * new_dn = parent (p_dn) + separator(s) + rdn (newrdn) + null.
+ * new_dn = parent (p_dn) + separator(s) + rdn (newrdn) + null.
*/
void
const char * newrdn )
{
- if ( p_dn == NULL ) {
- *new_dn = ch_strdup( newrdn );
- return;
- }
-
- *new_dn = (char *) ch_malloc( strlen( p_dn ) + strlen( newrdn ) + 3 );
+ if ( p_dn == NULL ) {
+ *new_dn = ch_strdup( newrdn );
+ return;
+ }
+
+ *new_dn = (char *) ch_malloc( strlen( p_dn ) + strlen( newrdn ) + 3 );
strcpy( *new_dn, newrdn );
strcat( *new_dn, "," );
projects / openldap / blobdiff