diff options
author | 2018-10-09 05:43:06 -0500 | |
---|---|---|
committer | 2018-10-17 00:33:03 -0500 | |
commit | 07a01b1f4503ad5681771e2b4c5307db597f81f8 (patch) | |
tree | 06b264a7e8aa3a708ee446cd37998103bfa88b6a /src/firejail/profile.c | |
parent | Merge pull request #2158 from crass/profile_conditional (diff) | |
download | firejail-07a01b1f4503ad5681771e2b4c5307db597f81f8.tar.gz firejail-07a01b1f4503ad5681771e2b4c5307db597f81f8.tar.zst firejail-07a01b1f4503ad5681771e2b4c5307db597f81f8.zip |
Allow include to search userdir then systemdir for "bare" profile file names.
Diffstat (limited to 'src/firejail/profile.c')
-rw-r--r-- | src/firejail/profile.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index 751347b29..c7c8fd9fa 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -1367,7 +1367,7 @@ void profile_read(const char *fname) { | |||
1367 | if (ptr && strlen(ptr) == 6) | 1367 | if (ptr && strlen(ptr) == 6) |
1368 | return; | 1368 | return; |
1369 | 1369 | ||
1370 | fprintf(stderr, "Error: cannot access profile file\n"); | 1370 | fprintf(stderr, "Error: cannot access profile file: %s\n", fname); |
1371 | exit(1); | 1371 | exit(1); |
1372 | } | 1372 | } |
1373 | 1373 | ||
@@ -1429,17 +1429,22 @@ void profile_read(const char *fname) { | |||
1429 | if (strncmp(ptr, "include ", 8) == 0) { | 1429 | if (strncmp(ptr, "include ", 8) == 0) { |
1430 | include_level++; | 1430 | include_level++; |
1431 | 1431 | ||
1432 | // extract profile filename and new skip params | 1432 | // expand macros in front of the include profile file |
1433 | char *newprofile = ptr + 8; // profile name | 1433 | char *newprofile = expand_macros(ptr + 8); |
1434 | 1434 | ||
1435 | // expand ${HOME}/ in front of the new profile file | 1435 | char *ptr2 = newprofile; |
1436 | char *newprofile2 = expand_macros(newprofile); | 1436 | while (*ptr2 != '/' && *ptr2 != '\0') |
1437 | ptr2++; | ||
1438 | // profile path contains no / chars, do a search | ||
1439 | if (*ptr2 == '\0') { | ||
1440 | profile_find_firejail(newprofile, 0); | ||
1441 | } | ||
1442 | else { | ||
1443 | profile_read(newprofile); | ||
1444 | } | ||
1437 | 1445 | ||
1438 | // recursivity | ||
1439 | profile_read((newprofile2)? newprofile2:newprofile); | ||
1440 | include_level--; | 1446 | include_level--; |
1441 | if (newprofile2) | 1447 | free(newprofile); |
1442 | free(newprofile2); | ||
1443 | free(ptr); | 1448 | free(ptr); |
1444 | continue; | 1449 | continue; |
1445 | } | 1450 | } |