Multi-threaded slapindex

[openldap] / servers / slapd / config.c

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 40be0f7ba59d982177f86d8ff6ad259c8128d7b6..8d5544183def6690f1005d663978c4607d4d98b2 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -81,6 +81,7 @@ static void fp_getline_init(ConfigArgs *c);
 static int fp_parse_line(ConfigArgs *c);
 
 static char    *strtok_quote(char *line, char *sep, char **quote_ptr);
+static char *strtok_quote_ldif(char **line);
 
 ConfigArgs *
 new_config_args( BackendDB *be, const char *fname, int lineno, int argc, char **argv )
@@ -190,7 +191,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
                int j;
                iarg = 0; larg = 0; barg = 0;
                switch(arg_type & ARGS_NUMERIC) {
-                       case ARG_INT:           iarg = atoi(c->argv[1]);                break;
+                       case ARG_INT:           iarg = strtol(c->argv[1], NULL, 0); break;
                        case ARG_LONG:          larg = strtol(c->argv[1], NULL, 0);     break;
                        case ARG_BER_LEN_T:     barg = (ber_len_t)atol(c->argv[1]);     break;
                        case ARG_ON_OFF:
@@ -285,7 +286,7 @@ int config_set_vals(ConfigTable *Conf, ConfigArgs *c) {
                                c->log, c->msg, 0);
                        return(ARG_BAD_CONF);
                }
-               ptr = (void *)((char *)ptr + (int)Conf->arg_item);
+               ptr = (void *)((char *)ptr + (long)Conf->arg_item);
        } else if (arg_type & ARGS_POINTER) {
                ptr = Conf->arg_item;
        }
@@ -371,7 +372,7 @@ config_get_vals(ConfigTable *cf, ConfigArgs *c)
                                ptr = c->bi->bi_private;
                        else
                                return 1;
-                       ptr = (void *)((char *)ptr + (int)cf->arg_item);
+                       ptr = (void *)((char *)ptr + (long)cf->arg_item);
                } else {
                        ptr = cf->arg_item;
                }
@@ -493,11 +494,87 @@ init_config_ocs( ConfigOCs *ocs ) {
        return 0;
 }
 
+/* Split an LDIF line into space-separated tokens. Words may be grouped
+ * by quotes. A quoted string may begin in the middle of a word, but must
+ * end at the end of the word (be followed by whitespace or EOS). Any other
+ * quotes are passed through unchanged. All other characters are passed
+ * through unchanged.
+ */
+static char *
+strtok_quote_ldif( char **line )
+{
+       char *beg, *ptr, *quote=NULL;
+       int inquote=0;
+
+       ptr = *line;
+
+       if ( !ptr || !*ptr )
+               return NULL;
+
+       while( isspace( *ptr )) ptr++;
+
+       if ( *ptr == '"' ) {
+               inquote = 1;
+               ptr++;
+       }
+
+       beg = ptr;
+
+       for (;*ptr;ptr++) {
+               if ( *ptr == '"' ) {
+                       if ( inquote && ( !ptr[1] || isspace(ptr[1]))) {
+                               *ptr++ = '\0';
+                               break;
+                       }
+                       inquote = 1;
+                       quote = ptr;
+                       continue;
+               }
+               if ( inquote )
+                       continue;
+               if ( isspace( *ptr )) {
+                       *ptr++ = '\0';
+                       break;
+               }
+       }
+       if ( quote ) {
+               while ( quote < ptr ) {
+                       *quote = quote[1];
+                       quote++;
+               }
+       }
+       if ( !*ptr ) {
+               *line = NULL;
+       } else {
+               while ( isspace( *ptr )) ptr++;
+               *line = ptr;
+       }
+       return beg;
+}
+
+static void
+config_parse_ldif( ConfigArgs *c )
+{
+       char *next;
+       c->tline = ch_strdup(c->line);
+       next = c->tline;
+
+       while ((c->argv[c->argc] = strtok_quote_ldif( &next )) != NULL) {
+               c->argc++;
+               if ( c->argc >= c->argv_size ) {
+                       char **tmp = ch_realloc( c->argv, (c->argv_size + ARGS_STEP) *
+                               sizeof( *c->argv ));
+                       c->argv = tmp;
+                       c->argv_size += ARGS_STEP;
+               }
+       }
+       c->argv[c->argc] = NULL;
+}
+
 int
 config_parse_vals(ConfigTable *ct, ConfigArgs *c, int valx)
 {
        int     rc = 0;
-       char    *saveline = NULL;
 
        snprintf( c->log, sizeof( c->log ), "%s: value #%d",
                ct->ad->ad_cname.bv_val, valx );
@@ -505,29 +582,19 @@ config_parse_vals(ConfigTable *ct, ConfigArgs *c, int valx)
        c->argv[0] = ct->ad->ad_cname.bv_val;
 
        if ( ( ct->arg_type & ARG_QUOTE ) && c->line[ 0 ] != '"' ) {
-               ber_len_t       len;
-
-               saveline = c->line;
-               len = strlen( c->line );
-               c->line = ch_malloc( len + STRLENOF( "\"\"" ) + 1 );
-               sprintf( c->line, "\"%s\"", saveline );
-       }
-
-       if ( fp_parse_line( c ) ) {
-               rc = 1;
+               c->argv[c->argc] = c->line;
+               c->argc++;
+               c->argv[c->argc] = NULL;
+               c->tline = NULL;
        } else {
-               rc = config_check_vals( ct, c, 1 );
-       }
-
-       if ( saveline ) {
-               ch_free( c->line );
-               c->line = saveline;
+               config_parse_ldif( c );
        }
+       rc = config_check_vals( ct, c, 1 );
+       ch_free( c->tline );
 
        if ( rc )
                rc = LDAP_CONSTRAINT_VIOLATION;
 
-       ch_free( c->tline );
        return rc;
 }
 
@@ -535,7 +602,6 @@ int
 config_parse_add(ConfigTable *ct, ConfigArgs *c)
 {
        int     rc = 0;
-       char    *saveline = NULL;
 
        snprintf( c->log, sizeof( c->log ), "%s: value #%d",
                ct->ad->ad_cname.bv_val, c->valx );
@@ -543,28 +609,17 @@ config_parse_add(ConfigTable *ct, ConfigArgs *c)
        c->argv[0] = ct->ad->ad_cname.bv_val;
 
        if ( ( ct->arg_type & ARG_QUOTE ) && c->line[ 0 ] != '"' ) {
-               ber_len_t       len;
-
-               saveline = c->line;
-               len = strlen( c->line );
-                       
-               c->line = ch_malloc( len + STRLENOF( "\"\"" ) + 1 );
-               sprintf( c->line, "\"%s\"", saveline );
-       }
-
-       if ( fp_parse_line( c ) ) {
-               rc = 1;
+               c->argv[c->argc] = c->line;
+               c->argc++;
+               c->argv[c->argc] = NULL;
+               c->tline = NULL;
        } else {
-               c->op = LDAP_MOD_ADD;
-               rc = config_add_vals( ct, c );
-       }
-
-       if ( saveline ) {
-               ch_free( c->line );
-               c->line = saveline;
+               config_parse_ldif( c );
        }
-
+       c->op = LDAP_MOD_ADD;
+       rc = config_add_vals( ct, c );
        ch_free( c->tline );
+
        return rc;
 }
 
@@ -638,7 +693,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
                ch_free( c->tline );
                if ( fp_parse_line( c ) ) {
                        rc = 1;
-                       goto leave;
+                       goto done;
                }
 
                if ( c->argc < 1 ) {
@@ -647,7 +702,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
                                c->log, 0, 0);
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
                        rc = 1;
-                       goto leave;
+                       goto done;
 #else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                        continue;
 #endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
@@ -665,11 +720,11 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
                                Debug(LDAP_DEBUG_CONFIG, "%s: unknown user type <%s>\n",
                                        c->log, c->argv[0], 0);
                                rc = 1;
-                               goto leave;
+                               goto done;
 
                        } else if ( rc == ARG_BAD_CONF ) {
                                rc = 1;
-                               goto leave;
+                               goto done;
                        }
                        
                } else if ( c->bi && !c->be ) {
@@ -696,7 +751,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
 #endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                                default:
                                        rc = 1;
-                                       goto leave;
+                                       goto done;
                                }
                        }
 
@@ -724,7 +779,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
 #endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                                default:
                                        rc = 1;
-                                       goto leave;
+                                       goto done;
                                }
                        }
 
@@ -742,7 +797,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
 #endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                                default:
                                        rc = 1;
-                                       goto leave;
+                                       goto done;
                                }
                        }
                        
@@ -753,7 +808,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
                                c->log, *c->argv, 0);
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
                        rc = 1;
-                       goto leave;
+                       goto done;
 #else /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
                        continue;
 #endif /* ! SLAPD_CONF_UNKNOWN_BAILOUT */
@@ -762,7 +817,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
 
        rc = 0;
 
-leave:
+done:
        ch_free(c->tline);
        fclose(fp);
        ch_free(c->argv);