diff options
author | Roger Dingledine <arma@torproject.org> | 2004-03-02 05:00:50 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2004-03-02 05:00:50 +0000 |
commit | 1147289dc058fcac13a488c9f774153d54387189 (patch) | |
tree | 76f63765a0bc9ef8e3f6baae3b8b86369a719ffe /src | |
parent | 08346f13f09f1644de81fde2641954a9a7231cf1 (diff) | |
download | tor-1147289dc058fcac13a488c9f774153d54387189.tar.gz tor-1147289dc058fcac13a488c9f774153d54387189.zip |
make config_assign fail rather than warn for unrecognized config options
svn:r1194
Diffstat (limited to 'src')
-rw-r--r-- | src/or/config.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/or/config.c b/src/or/config.c index d45234b809..553415e587 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -26,7 +26,7 @@ static struct config_line *config_get_commandlines(int argc, char **argv); static struct config_line *config_get_lines(FILE *f); static void config_free_lines(struct config_line *front); static int config_compare(struct config_line *c, char *key, int type, void *arg); -static void config_assign(or_options_t *options, struct config_line *list); +static int config_assign(or_options_t *options, struct config_line *list); /* open configuration file for reading */ static FILE *config_open(const unsigned char *filename) { @@ -141,9 +141,11 @@ static int config_compare(struct config_line *c, char *key, int type, void *arg) return 1; } -static void config_assign(or_options_t *options, struct config_line *list) { - - /* iterate through list. for each item convert as appropriate and assign to 'options'. */ +/* Iterate through list. + * For each item, convert as appropriate and assign to 'options'. + * If an item is unrecognized, return -1 immediately, + * else return 0 for success. */ +static int config_assign(or_options_t *options, struct config_line *list) { while(list) { if( @@ -203,11 +205,13 @@ static void config_assign(or_options_t *options, struct config_line *list) { ) { /* then we're ok. it matched something. */ } else { - log_fn(LOG_WARN,"Ignoring unknown keyword '%s'.",list->key); + log_fn(LOG_WARN,"Unknown keyword '%s'. Failing.",list->key); + return -1; } list = list->next; } + return 0; } /* XXX are there any other specifiers we want to give so making @@ -453,14 +457,16 @@ int getconfig(int argc, char **argv, or_options_t *options) { } else { /* it opened successfully. use it. */ cl = config_get_lines(cf); if(!cl) return -1; - config_assign(options,cl); + if(config_assign(options,cl) < 0) + return -1; config_free_lines(cl); config_close(cf); } /* go through command-line variables too */ cl = config_get_commandlines(argc,argv); - config_assign(options,cl); + if(config_assign(options,cl) < 0) + return -1; config_free_lines(cl); /* Validate options */ |