diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:46:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:46:13 -0400 |
| commit | 92d335b3dcd7b302d8a07c105f9fe8a98848cad3 (patch) | |
| tree | fe1cebe40b18b1409489d29fba8e1fcc809b7e0e /src/common/confline.h | |
| parent | d34fa32ece2179c18f8aeae0026d2b452956842f (diff) | |
| parent | ba3a5f82f11388237a3ba4995ddf0b6ffaaf492a (diff) | |
| download | tor-92d335b3dcd7b302d8a07c105f9fe8a98848cad3.tar.gz tor-92d335b3dcd7b302d8a07c105f9fe8a98848cad3.zip | |
Merge remote-tracking branch 'jigsaw/torrc-dir-fix-1922_squashed2'
Diffstat (limited to 'src/common/confline.h')
| -rw-r--r-- | src/common/confline.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/confline.h b/src/common/confline.h index 477c6929a2..eb863e8fd8 100644 --- a/src/common/confline.h +++ b/src/common/confline.h @@ -15,6 +15,8 @@ /* Removes all previous configuration for an option. */ #define CONFIG_LINE_CLEAR 2 +#define MAX_INCLUDE_RECURSION_LEVEL 31 + /** A linked list of lines in a config file, or elsewhere */ typedef struct config_line_t { char *key; @@ -41,6 +43,8 @@ const config_line_t *config_line_find(const config_line_t *lines, int config_lines_eq(config_line_t *a, config_line_t *b); int config_count_key(const config_line_t *a, const char *key); int config_get_lines(const char *string, config_line_t **result, int extended); +int config_get_lines_include(const char *string, config_line_t **result, + int extended, int *has_include); void config_free_lines(config_line_t *front); const char *parse_config_line_from_str_verbose(const char *line, char **key_out, char **value_out, |