aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2016-11-21 09:32:33 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2016-11-21 09:32:33 -0500
commitbc6818c27f2f0310e71f69014c0e0bca30f330a6 (patch)
tree66ab0dffcefb9f4c19a44178346105ef4df6fcf9 /src
parentMerge branch 'master' of https://github.com/netblue30/firejail (diff)
downloadfirejail-bc6818c27f2f0310e71f69014c0e0bca30f330a6.tar.gz
firejail-bc6818c27f2f0310e71f69014c0e0bca30f330a6.tar.zst
firejail-bc6818c27f2f0310e71f69014c0e0bca30f330a6.zip
--quiet fix
Diffstat (limited to 'src')
-rw-r--r--src/firejail/profile.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index abb8bd9b6..694509511 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -130,7 +130,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
130#if HAVE_USERNS 130#if HAVE_USERNS
131 if (checkcfg(CFG_USERNS)) 131 if (checkcfg(CFG_USERNS))
132 check_user_namespace(); 132 check_user_namespace();
133 else 133 else if (!arg_quiet)
134 fprintf(stderr, "Warning: user namespace feature is disabled in Firejail configuration file\n"); 134 fprintf(stderr, "Warning: user namespace feature is disabled in Firejail configuration file\n");
135#endif 135#endif
136 136
@@ -144,7 +144,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
144#ifdef HAVE_SECCOMP 144#ifdef HAVE_SECCOMP
145 if (checkcfg(CFG_SECCOMP)) 145 if (checkcfg(CFG_SECCOMP))
146 arg_seccomp = 1; 146 arg_seccomp = 1;
147 else 147 else if (!arg_quiet)
148 fprintf(stderr, "Warning: user seccomp feature is disabled in Firejail configuration file\n"); 148 fprintf(stderr, "Warning: user seccomp feature is disabled in Firejail configuration file\n");
149#endif 149#endif
150 return 0; 150 return 0;
@@ -175,7 +175,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
175 cfg.home_private_keep = ptr + 13; 175 cfg.home_private_keep = ptr + 13;
176 arg_private = 1; 176 arg_private = 1;
177 } 177 }
178 else 178 else if (!arg_quiet)
179 fprintf(stderr, "Warning: private-home is disabled in Firejail configuration file\n"); 179 fprintf(stderr, "Warning: private-home is disabled in Firejail configuration file\n");
180#endif 180#endif
181 return 0; 181 return 0;
@@ -208,7 +208,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
208#ifdef HAVE_NETWORK 208#ifdef HAVE_NETWORK
209 if (checkcfg(CFG_NETWORK)) 209 if (checkcfg(CFG_NETWORK))
210 arg_netfilter = 1; 210 arg_netfilter = 1;
211 else 211 else if (!arg_quiet)
212 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 212 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
213#endif 213#endif
214 return 0; 214 return 0;
@@ -222,7 +222,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
222 errExit("strdup"); 222 errExit("strdup");
223 check_netfilter_file(arg_netfilter_file); 223 check_netfilter_file(arg_netfilter_file);
224 } 224 }
225 else 225 else if (!arg_quiet)
226 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 226 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
227#endif 227#endif
228 return 0; 228 return 0;
@@ -236,7 +236,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
236 errExit("strdup"); 236 errExit("strdup");
237 check_netfilter_file(arg_netfilter6_file); 237 check_netfilter_file(arg_netfilter6_file);
238 } 238 }
239 else 239 else if (!arg_quiet)
240 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 240 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
241#endif 241#endif
242 return 0; 242 return 0;
@@ -254,7 +254,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
254 cfg.interface2.configured = 0; 254 cfg.interface2.configured = 0;
255 cfg.interface3.configured = 0; 255 cfg.interface3.configured = 0;
256 } 256 }
257 else 257 else if (!arg_quiet)
258 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 258 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
259#endif 259#endif
260 return 0; 260 return 0;
@@ -295,7 +295,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
295 } 295 }
296 net_configure_bridge(br, ptr + 4); 296 net_configure_bridge(br, ptr + 4);
297 } 297 }
298 else 298 else if (!arg_quiet)
299 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 299 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
300#endif 300#endif
301 return 0; 301 return 0;
@@ -318,7 +318,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
318 exit(1); 318 exit(1);
319 } 319 }
320 } 320 }
321 else 321 else if (!arg_quiet)
322 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 322 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
323#endif 323#endif
324 return 0; 324 return 0;
@@ -363,7 +363,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
363 exit(1); 363 exit(1);
364 } 364 }
365 } 365 }
366 else 366 else if (!arg_quiet)
367 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 367 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
368#endif 368#endif
369 return 0; 369 return 0;
@@ -390,7 +390,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
390 exit(1); 390 exit(1);
391 } 391 }
392 } 392 }
393 else 393 else if (!arg_quiet)
394 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 394 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
395#endif 395#endif
396 return 0; 396 return 0;
@@ -410,7 +410,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
410 exit(1); 410 exit(1);
411 } 411 }
412 } 412 }
413 else 413 else if (!arg_quiet)
414 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 414 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
415#endif 415#endif
416 return 0; 416 return 0;
@@ -439,7 +439,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
439 } 439 }
440 } 440 }
441 } 441 }
442 else 442 else if (!arg_quiet)
443 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 443 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
444#endif 444#endif
445 return 0; 445 return 0;
@@ -467,7 +467,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
467// } 467// }
468 468
469 } 469 }
470 else 470 else if (!arg_quiet)
471 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 471 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
472#endif 472#endif
473 return 0; 473 return 0;
@@ -481,7 +481,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
481 exit(1); 481 exit(1);
482 } 482 }
483 } 483 }
484 else 484 else if (!arg_quiet)
485 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n"); 485 fprintf(stderr, "Warning: networking features are disabled in Firejail configuration file\n");
486#endif 486#endif
487 return 0; 487 return 0;
@@ -508,7 +508,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
508 if (!cfg.protocol) 508 if (!cfg.protocol)
509 errExit("strdup"); 509 errExit("strdup");
510 } 510 }
511 else 511 else if (!arg_quiet)
512 fprintf(stderr, "Warning: user seccomp feature is disabled in Firejail configuration file\n"); 512 fprintf(stderr, "Warning: user seccomp feature is disabled in Firejail configuration file\n");
513#endif 513#endif
514 return 0; 514 return 0;
@@ -530,7 +530,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
530 arg_seccomp = 1; 530 arg_seccomp = 1;
531 cfg.seccomp_list = seccomp_check_list(ptr + 8); 531 cfg.seccomp_list = seccomp_check_list(ptr + 8);
532 } 532 }
533 else 533 else if (!arg_quiet)
534 fprintf(stderr, "Warning: user seccomp feature is disabled in Firejail configuration file\n"); 534 fprintf(stderr, "Warning: user seccomp feature is disabled in Firejail configuration file\n");
535#endif 535#endif
536 536
@@ -544,7 +544,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
544 arg_seccomp = 1; 544 arg_seccomp = 1;
545 cfg.seccomp_list_drop = seccomp_check_list(ptr + 13); 545 cfg.seccomp_list_drop = seccomp_check_list(ptr + 13);
546 } 546 }
547 else 547 else if (!arg_quiet)
548 fprintf(stderr, "Warning: user seccomp feature is disabled in Firejail configuration file\n"); 548 fprintf(stderr, "Warning: user seccomp feature is disabled in Firejail configuration file\n");
549#endif 549#endif
550 return 0; 550 return 0;
@@ -557,7 +557,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
557 arg_seccomp = 1; 557 arg_seccomp = 1;
558 cfg.seccomp_list_keep= seccomp_check_list(ptr + 13); 558 cfg.seccomp_list_keep= seccomp_check_list(ptr + 13);
559 } 559 }
560 else 560 else if (!arg_quiet)
561 fprintf(stderr, "Warning: user seccomp feature is disabled in Firejail configuration file\n"); 561 fprintf(stderr, "Warning: user seccomp feature is disabled in Firejail configuration file\n");
562#endif 562#endif
563 return 0; 563 return 0;
@@ -779,7 +779,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
779 *(dname2 - 1) = ','; 779 *(dname2 - 1) = ',';
780 return 1; 780 return 1;
781 } 781 }
782 else { 782 else if (!arg_quiet) {
783 fprintf(stderr, "Warning: bind feature is disabled in Firejail configuration file\n"); 783 fprintf(stderr, "Warning: bind feature is disabled in Firejail configuration file\n");
784 return 0; 784 return 0;
785 } 785 }