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>

diff --git a/src/scanner.l b/src/scanner.l
index 88669d0e6e5f66ce89301e5ea5d7fe0d1d1150c2..6f1a5512a81e04f3b6873af7695750e2b9f7a0e2 100644 (file)
--- 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");