diff options
author | netblue30 <netblue30@yahoo.com> | 2016-04-02 18:59:52 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-04-02 18:59:52 -0400 |
commit | c89bd3131770903c7121c271a7763b2ef1912272 (patch) | |
tree | b16afecd0a83554026d4a50355106fe12844b244 /src | |
parent | Merge pull request #406 from avoidr/cmus.profile (diff) | |
download | firejail-c89bd3131770903c7121c271a7763b2ef1912272.tar.gz firejail-c89bd3131770903c7121c271a7763b2ef1912272.tar.zst firejail-c89bd3131770903c7121c271a7763b2ef1912272.zip |
various fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/main.c | 2 | ||||
-rw-r--r-- | src/firejail/profile.c | 2 | ||||
-rw-r--r-- | src/firejail/sandbox.c | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c index 0269ff585..a66e10e0f 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -1268,8 +1268,8 @@ int main(int argc, char **argv) { | |||
1268 | fprintf(stderr, "Error: invalid private-bin option\n"); | 1268 | fprintf(stderr, "Error: invalid private-bin option\n"); |
1269 | exit(1); | 1269 | exit(1); |
1270 | } | 1270 | } |
1271 | fs_check_bin_list(); | ||
1272 | arg_private_bin = 1; | 1271 | arg_private_bin = 1; |
1272 | fs_check_bin_list(); | ||
1273 | } | 1273 | } |
1274 | else if (strcmp(argv[i], "--private-tmp") == 0) { | 1274 | else if (strcmp(argv[i], "--private-tmp") == 0) { |
1275 | arg_private_tmp = 1; | 1275 | arg_private_tmp = 1; |
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index d7ea4a550..d2894d463 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -385,8 +385,8 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
385 | // private /bin list of files | 385 | // private /bin list of files |
386 | if (strncmp(ptr, "private-bin ", 12) == 0) { | 386 | if (strncmp(ptr, "private-bin ", 12) == 0) { |
387 | cfg.bin_private_keep = ptr + 12; | 387 | cfg.bin_private_keep = ptr + 12; |
388 | fs_check_bin_list(); | ||
389 | arg_private_bin = 1; | 388 | arg_private_bin = 1; |
389 | fs_check_bin_list(); | ||
390 | return 0; | 390 | return 0; |
391 | } | 391 | } |
392 | 392 | ||
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c index 732ebf27e..ccddeb888 100644 --- a/src/firejail/sandbox.c +++ b/src/firejail/sandbox.c | |||
@@ -227,8 +227,14 @@ static void start_application(void) { | |||
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
230 | if (cfg.original_program_index == 0) { | ||
231 | fprintf(stderr, "Error: --shell=none configured, but no program specified\n"); | ||
232 | exit(1); | ||
233 | } | ||
234 | |||
230 | if (!arg_command && !arg_quiet) | 235 | if (!arg_command && !arg_quiet) |
231 | printf("Child process initialized\n"); | 236 | printf("Child process initialized\n"); |
237 | |||
232 | execvp(cfg.original_argv[cfg.original_program_index], &cfg.original_argv[cfg.original_program_index]); | 238 | execvp(cfg.original_argv[cfg.original_program_index], &cfg.original_argv[cfg.original_program_index]); |
233 | } | 239 | } |
234 | //**************************************** | 240 | //**************************************** |