Sync with HEAD

[openldap] / servers / slapd / config.h

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index 5ddd7552c0962f9f72f718758179a37d63d7175c..3dc25928031df9e67f4e24142fecf50b8fcee7fb 100644 (file)
--- a/servers/slapd/config.h
+++ b/servers/slapd/config.h
@@ -109,7 +109,7 @@ typedef struct config_args_s {
        char *line;
        char *tline;
        const char *fname;
-       unsigned long lineno;
+       int lineno;
        char log[MAXPATHLEN + STRLENOF(": line 18446744073709551615") + 1];
        char msg[SLAP_TEXT_BUFLEN];
        int depth;
@@ -154,8 +154,18 @@ typedef struct config_args_s {
 #define value_ndn values.v_dn.vdn_ndn
 
 int config_register_schema(ConfigTable *ct, ConfigOCs *co);
+int config_del_vals(ConfigTable *cf, ConfigArgs *c);
 int config_get_vals(ConfigTable *ct, ConfigArgs *c);
 int config_add_vals(ConfigTable *ct, ConfigArgs *c);
+
+void init_config_argv( ConfigArgs *c );
+int init_config_attrs(ConfigTable *ct);
+int init_config_ocs( ConfigOCs *ocs );
+int config_parse_vals(ConfigTable *ct, ConfigArgs *c, int valx);
+int config_parse_add(ConfigTable *ct, ConfigArgs *c);
+int read_config_file(const char *fname, int depth, ConfigArgs *cf,
+       ConfigTable *cft );
+
 ConfigTable * config_find_keyword(ConfigTable *ct, ConfigArgs *c);
 Entry * config_build_entry( Operation *op, SlapReply *rs, CfEntryInfo *parent,
        ConfigArgs *c, struct berval *rdn, ConfigOCs *main, ConfigOCs *extra );