diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-08-01 23:09:39 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-08-10 10:27:11 +0200 |
| commit | f92a1a5c4a8761c39a76b264859f0ff2c8f71179 (patch) | |
| tree | 083f5484a07abb57e4fd9027a79de306d5d817e7 /src/scanner.l | |
| parent | 5fa8528fa9631ff5b0d72d9e9bdc76220f992e8f (diff) | |
scanner: honor absolute and relative paths via include file
If the path refers to an absolute or relative path, do not check for the
default include paths, eg. /etc/nftables/.
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1040
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/scanner.l b/src/scanner.l index 88669d0e..6f1a5512 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -611,6 +611,13 @@ err: return -1; } +static bool search_in_include_path(const char *filename) +{ + return (strncmp(filename, "./", strlen("./") != 0) && + strncmp(filename, "../", strlen("../") != 0) && + filename[0] != '/'); +} + int scanner_include_file(void *scanner, const char *filename, const struct location *loc) { @@ -622,13 +629,16 @@ int scanner_include_file(void *scanner, const char *filename, FILE *f; f = NULL; - for (i = 0; i < INCLUDE_PATHS_MAX; i++) { - if (include_paths[i] == NULL) - break; - snprintf(buf, sizeof(buf), "%s/%s", include_paths[i], filename); - f = fopen(buf, "r"); - if (f != NULL) - break; + if (search_in_include_path(filename)) { + for (i = 0; i < INCLUDE_PATHS_MAX; i++) { + if (include_paths[i] == NULL) + break; + snprintf(buf, sizeof(buf), "%s/%s", + include_paths[i], filename); + f = fopen(buf, "r"); + if (f != NULL) + break; + } } if (f == NULL) { f = fopen(filename, "r"); |