diff options
Diffstat (limited to 'src/firejail')
-rw-r--r-- | src/firejail/checkcfg.c | 7 | ||||
-rw-r--r-- | src/firejail/main.c | 27 |
2 files changed, 0 insertions, 34 deletions
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c index 7792c6541..3283fae13 100644 --- a/src/firejail/checkcfg.c +++ b/src/firejail/checkcfg.c | |||
@@ -349,13 +349,6 @@ static const char *const compiletime_support = | |||
349 | "disabled" | 349 | "disabled" |
350 | #endif | 350 | #endif |
351 | 351 | ||
352 | "\n\t- firetunnel support is " | ||
353 | #ifdef HAVE_FIRETUNNEL | ||
354 | "enabled" | ||
355 | #else | ||
356 | "disabled" | ||
357 | #endif | ||
358 | |||
359 | "\n\t- IDS support is " | 352 | "\n\t- IDS support is " |
360 | #ifdef HAVE_IDS | 353 | #ifdef HAVE_IDS |
361 | "enabled" | 354 | "enabled" |
diff --git a/src/firejail/main.c b/src/firejail/main.c index aaa7c8a2f..76bfcede8 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -1827,33 +1827,6 @@ int main(int argc, char **argv, char **envp) { | |||
1827 | exit_err_feature("overlayfs"); | 1827 | exit_err_feature("overlayfs"); |
1828 | } | 1828 | } |
1829 | #endif | 1829 | #endif |
1830 | #ifdef HAVE_FIRETUNNEL | ||
1831 | else if (strcmp(argv[i], "--tunnel") == 0) { | ||
1832 | // try to connect to the default client side of the tunnel | ||
1833 | // if this fails, try the default server side of the tunnel | ||
1834 | if (access("/run/firetunnel/ftc", R_OK) == 0) | ||
1835 | profile_read("/run/firetunnel/ftc"); | ||
1836 | else if (access("/run/firetunnel/fts", R_OK) == 0) | ||
1837 | profile_read("/run/firetunnel/fts"); | ||
1838 | else { | ||
1839 | fprintf(stderr, "Error: no default firetunnel found, please specify it using --tunnel=devname option\n"); | ||
1840 | exit(1); | ||
1841 | } | ||
1842 | } | ||
1843 | else if (strncmp(argv[i], "--tunnel=", 9) == 0) { | ||
1844 | char *fname; | ||
1845 | |||
1846 | if (asprintf(&fname, "/run/firetunnel/%s", argv[i] + 9) == -1) | ||
1847 | errExit("asprintf"); | ||
1848 | invalid_filename(fname, 0); // no globbing | ||
1849 | if (access(fname, R_OK) == 0) | ||
1850 | profile_read(fname); | ||
1851 | else { | ||
1852 | fprintf(stderr, "Error: tunnel not found\n"); | ||
1853 | exit(1); | ||
1854 | } | ||
1855 | } | ||
1856 | #endif | ||
1857 | else if (strncmp(argv[i], "--include=", 10) == 0) { | 1830 | else if (strncmp(argv[i], "--include=", 10) == 0) { |
1858 | char *ppath = expand_macros(argv[i] + 10); | 1831 | char *ppath = expand_macros(argv[i] + 10); |
1859 | if (!ppath) | 1832 | if (!ppath) |