diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-04-17 12:56:06 -0300 |
---|---|---|
committer | Simo Piiroinen <simo.piiroinen@jolla.com> | 2024-04-23 15:12:09 +0300 |
commit | 773073c8484914b31ce68cbd635212253bf96f4c (patch) | |
tree | 16f774d86d57c41d09e4c43e62a8df042745699b /src | |
parent | profiles: allow-ssh: allow /etc/ssh/ssh_revoked_hosts (#6309) (diff) | |
download | firejail-773073c8484914b31ce68cbd635212253bf96f4c.tar.gz firejail-773073c8484914b31ce68cbd635212253bf96f4c.tar.zst firejail-773073c8484914b31ce68cbd635212253bf96f4c.zip |
refactor: make rundir lock variables global
To enable using them outside of src/firejail/main.c.
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/firejail.h | 2 | ||||
-rw-r--r-- | src/firejail/main.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index b8ec4d474..e48591903 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -282,6 +282,8 @@ static inline int any_dhcp(void) { | |||
282 | return any_ip_dhcp() || any_ip6_dhcp(); | 282 | return any_ip_dhcp() || any_ip6_dhcp(); |
283 | } | 283 | } |
284 | 284 | ||
285 | extern int lockfd_directory; | ||
286 | extern int lockfd_network; | ||
285 | extern int arg_private; // mount private /home | 287 | extern int arg_private; // mount private /home |
286 | extern int arg_private_cache; // private home/.cache | 288 | extern int arg_private_cache; // private home/.cache |
287 | extern int arg_debug; // print debug messages | 289 | extern int arg_debug; // print debug messages |
diff --git a/src/firejail/main.c b/src/firejail/main.c index 0ce18ab01..34d5b091f 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c | |||
@@ -63,6 +63,8 @@ gid_t firejail_gid = 0; | |||
63 | static char child_stack[STACK_SIZE] __attribute__((aligned(STACK_ALIGNMENT))); // space for child's stack | 63 | static char child_stack[STACK_SIZE] __attribute__((aligned(STACK_ALIGNMENT))); // space for child's stack |
64 | 64 | ||
65 | Config cfg; // configuration | 65 | Config cfg; // configuration |
66 | int lockfd_directory = -1; | ||
67 | int lockfd_network = -1; | ||
66 | int arg_private = 0; // mount private /home and /tmp directoryu | 68 | int arg_private = 0; // mount private /home and /tmp directoryu |
67 | int arg_private_cache = 0; // mount private home/.cache | 69 | int arg_private_cache = 0; // mount private home/.cache |
68 | int arg_debug = 0; // print debug messages | 70 | int arg_debug = 0; // print debug messages |
@@ -1056,8 +1058,6 @@ static int check_postexec(const char *list) { | |||
1056 | int main(int argc, char **argv, char **envp) { | 1058 | int main(int argc, char **argv, char **envp) { |
1057 | int i; | 1059 | int i; |
1058 | int prog_index = -1; // index in argv where the program command starts | 1060 | int prog_index = -1; // index in argv where the program command starts |
1059 | int lockfd_network = -1; | ||
1060 | int lockfd_directory = -1; | ||
1061 | int custom_profile = 0; // custom profile loaded | 1061 | int custom_profile = 0; // custom profile loaded |
1062 | int arg_caps_cmdline = 0; // caps requested on command line (used to break out of --chroot) | 1062 | int arg_caps_cmdline = 0; // caps requested on command line (used to break out of --chroot) |
1063 | char **ptr; | 1063 | char **ptr; |