DirectoryString syntaxes must have one or more octets to be valid.

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 0b85141b88ca3e9cf27c86528ba685c72616b580..a20d5a2cb5c845aff9bf52cb8487299ccc42ed61 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -1,7 +1,7 @@
 /* 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
  */
 
@@ -45,13 +45,13 @@ dn_validate( char *dn )
                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;
@@ -59,12 +59,12 @@ dn_validate( char *dn )
                        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;
@@ -73,12 +73,12 @@ dn_validate( char *dn )
                        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;
@@ -90,7 +90,7 @@ dn_validate( char *dn )
                        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;
@@ -101,15 +101,15 @@ dn_validate( char *dn )
                        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 == '+' ) {
@@ -117,8 +117,8 @@ dn_validate( char *dn )
                                } else {
                                        *d++ = ',';
                                }
-                       } else if ( gotesc && !NEEDSESCAPE( *s ) &&
-                           !SEPARATOR( *s ) ) {
+                       } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) &&
+                           !RDN_SEPARATOR( *s ) ) {
                                *--d = *s;
                                d++;
                        } else {
@@ -130,25 +130,28 @@ dn_validate( char *dn )
                        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_validate - unknown state %d\n", state, 0, 0 );
                        break;
                }
+
                if ( *s == '\\' ) {
                        gotesc = 1;
                } else {
@@ -210,7 +213,7 @@ dn_parent(
                return NULL;
        }
 
-       while(*dn && SPACE(*dn)) {
+       while(*dn != '\0' && ASCII_SPACE(*dn)) {
                dn++;
        }
 
@@ -223,7 +226,7 @@ dn_parent(
        }
 
        /*
-        * 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,...
         */
 
@@ -242,7 +245,7 @@ dn_parent(
                } else {
                        if ( *s == '"' ) {
                                inquote = 1;
-                       } else if ( DNSEPARATOR( *s ) ) {
+                       } else if ( DN_SEPARATOR( *s ) ) {
                                return( ch_strdup( &s[1] ) );
                        }
                }
@@ -253,28 +256,28 @@ dn_parent(
 
 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 );
+       dn = ch_strdup( dn_in );
 
        inquote = 0;
 
@@ -292,7 +295,7 @@ char * dn_rdn(
                } else {
                        if ( *s == '"' ) {
                                inquote = 1;
-                       } else if ( DNSEPARATOR( *s ) ) {
+                       } else if ( DN_SEPARATOR( *s ) ) {
                                *s = '\0';
                                return( dn );
                        }
@@ -336,8 +339,8 @@ char **dn_subtree(
 
 int
 dn_issuffix(
-    char       *dn,
-    char       *suffix
+    const char *dn,
+    const char *suffix
 )
 {
        int     dnlen, suffixlen;
@@ -378,7 +381,7 @@ dn_issuffix(
  */ 
 
 static char * 
-get_next_substring( char * s, char d )
+get_next_substring( const char * s, char d )
 {
 
        char    *str, *r;
@@ -387,10 +390,8 @@ get_next_substring( char * s, char d )
 
        /* Skip leading spaces */
        
-       while ( *s && SPACE(*s) ) {
-           
+       while ( *s && ASCII_SPACE(*s) ) {
                s++;
-           
        }
        
        /* Copy word */
@@ -421,11 +422,9 @@ get_next_substring( char * s, char d )
  * 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, '=' );
-
 }
 
 
@@ -439,15 +438,13 @@ char * rdn_attr_type( char * 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;
@@ -478,10 +475,8 @@ build_new_dn( char ** new_dn,
 {
 
     if ( p_dn == NULL ) {
-
        *new_dn = ch_strdup( newrdn );
        return;
-
     }
     
     *new_dn = (char *) ch_malloc( strlen( p_dn ) + strlen( newrdn ) + 3 );