aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar thewisenerd <thewisenerd@protonmail.com>2016-12-24 07:04:28 +0530
committerLibravatar thewisenerd <thewisenerd@protonmail.com>2016-12-24 07:16:28 +0530
commitee338c3757e3b02765689623a6e81ee8b6c55905 (patch)
treec1aa1c2136ca612452507cd500bd54b185146e6a
parentargv: private-home: exit on invalid option (diff)
downloadfirejail-ee338c3757e3b02765689623a6e81ee8b6c55905.tar.gz
firejail-ee338c3757e3b02765689623a6e81ee8b6c55905.tar.zst
firejail-ee338c3757e3b02765689623a6e81ee8b6c55905.zip
firejail: private-* : check, then assign.
-rw-r--r--src/firejail/main.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c
index f9742cc3f..c7470c33b 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1521,38 +1521,38 @@ int main(int argc, char **argv) {
1521 } 1521 }
1522 1522
1523 // extract private etc list 1523 // extract private etc list
1524 cfg.etc_private_keep = argv[i] + 14; 1524 if (*(argv[i] + 14) == '\0') {
1525 if (*cfg.etc_private_keep == '\0') {
1526 fprintf(stderr, "Error: invalid private-etc option\n"); 1525 fprintf(stderr, "Error: invalid private-etc option\n");
1527 exit(1); 1526 exit(1);
1528 } 1527 }
1528 cfg.etc_private_keep = argv[i] + 14;
1529 arg_private_etc = 1; 1529 arg_private_etc = 1;
1530 } 1530 }
1531 else if (strncmp(argv[i], "--private-opt=", 14) == 0) { 1531 else if (strncmp(argv[i], "--private-opt=", 14) == 0) {
1532 // extract private opt list 1532 // extract private opt list
1533 cfg.opt_private_keep = argv[i] + 14; 1533 if (*(argv[i] + 14) == '\0') {
1534 if (*cfg.opt_private_keep == '\0') {
1535 fprintf(stderr, "Error: invalid private-opt option\n"); 1534 fprintf(stderr, "Error: invalid private-opt option\n");
1536 exit(1); 1535 exit(1);
1537 } 1536 }
1537 cfg.opt_private_keep = argv[i] + 14;
1538 arg_private_opt = 1; 1538 arg_private_opt = 1;
1539 } 1539 }
1540 else if (strncmp(argv[i], "--private-srv=", 14) == 0) { 1540 else if (strncmp(argv[i], "--private-srv=", 14) == 0) {
1541 // extract private srv list 1541 // extract private srv list
1542 cfg.srv_private_keep = argv[i] + 14; 1542 if (*(argv[i] + 14) == '\0') {
1543 if (*cfg.srv_private_keep == '\0') {
1544 fprintf(stderr, "Error: invalid private-etc option\n"); 1543 fprintf(stderr, "Error: invalid private-etc option\n");
1545 exit(1); 1544 exit(1);
1546 } 1545 }
1546 cfg.srv_private_keep = argv[i] + 14;
1547 arg_private_srv = 1; 1547 arg_private_srv = 1;
1548 } 1548 }
1549 else if (strncmp(argv[i], "--private-bin=", 14) == 0) { 1549 else if (strncmp(argv[i], "--private-bin=", 14) == 0) {
1550 // extract private bin list 1550 // extract private bin list
1551 cfg.bin_private_keep = argv[i] + 14; 1551 if (*(argv[i] + 14) == '\0') {
1552 if (*cfg.bin_private_keep == '\0') {
1553 fprintf(stderr, "Error: invalid private-bin option\n"); 1552 fprintf(stderr, "Error: invalid private-bin option\n");
1554 exit(1); 1553 exit(1);
1555 } 1554 }
1555 cfg.bin_private_keep = argv[i] + 14;
1556 arg_private_bin = 1; 1556 arg_private_bin = 1;
1557 } 1557 }
1558 else if (strcmp(argv[i], "--private-tmp") == 0) { 1558 else if (strcmp(argv[i], "--private-tmp") == 0) {