diff options
author | 2016-09-08 07:56:29 -0400 | |
---|---|---|
committer | 2016-09-08 07:56:29 -0400 | |
commit | e8452a37f7bd0e637cccee55973519f9a2129c2b (patch) | |
tree | cd0c45009439e93866c767f729823f88ebcf558e /src | |
parent | testcase for read_pid fix (diff) | |
parent | use enum for enumeration (diff) | |
download | firejail-e8452a37f7bd0e637cccee55973519f9a2129c2b.tar.gz firejail-e8452a37f7bd0e637cccee55973519f9a2129c2b.tar.zst firejail-e8452a37f7bd0e637cccee55973519f9a2129c2b.zip |
Merge pull request #771 from l29ah/master
use enum for enumeration
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/firejail.h | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index cb8070ae6..776bfbc74 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -631,22 +631,24 @@ void sandboxfs_name(int op, const char *name, const char *path); | |||
631 | void sandboxfs(int op, pid_t pid, const char *patqh); | 631 | void sandboxfs(int op, pid_t pid, const char *patqh); |
632 | 632 | ||
633 | // checkcfg.c | 633 | // checkcfg.c |
634 | #define CFG_FILE_TRANSFER 0 | 634 | enum { |
635 | #define CFG_X11 1 | 635 | CFG_FILE_TRANSFER = 0, |
636 | #define CFG_BIND 2 | 636 | CFG_X11, |
637 | #define CFG_USERNS 3 | 637 | CFG_BIND, |
638 | #define CFG_CHROOT 4 | 638 | CFG_USERNS, |
639 | #define CFG_SECCOMP 5 | 639 | CFG_CHROOT, |
640 | #define CFG_NETWORK 6 | 640 | CFG_SECCOMP, |
641 | #define CFG_RESTRICTED_NETWORK 7 | 641 | CFG_NETWORK, |
642 | #define CFG_FORCE_NONEWPRIVS 8 | 642 | CFG_RESTRICTED_NETWORK, |
643 | #define CFG_WHITELIST 9 | 643 | CFG_FORCE_NONEWPRIVS, |
644 | #define CFG_XEPHYR_WINDOW_TITLE 10 | 644 | CFG_WHITELIST, |
645 | #define CFG_REMOUNT_PROC_SYS 11 | 645 | CFG_XEPHYR_WINDOW_TITLE, |
646 | #define CFG_OVERLAYFS 12 | 646 | CFG_REMOUNT_PROC_SYS, |
647 | #define CFG_CHROOT_DESKTOP 13 | 647 | CFG_OVERLAYFS, |
648 | #define CFG_PRIVATE_HOME 14 | 648 | CFG_CHROOT_DESKTOP, |
649 | #define CFG_MAX 15 // this should always be the last entry | 649 | CFG_PRIVATE_HOME, |
650 | CFG_MAX // this should always be the last entry | ||
651 | }; | ||
650 | extern char *xephyr_screen; | 652 | extern char *xephyr_screen; |
651 | extern char *xephyr_extra_params; | 653 | extern char *xephyr_extra_params; |
652 | extern char *netfilter_default; | 654 | extern char *netfilter_default; |