diff options
author | Kristóf Marussy <kris7topher@gmail.com> | 2019-12-27 18:41:29 +0100 |
---|---|---|
committer | Kristóf Marussy <kris7topher@gmail.com> | 2019-12-30 02:38:59 +0100 |
commit | d3d806ddb25249cf0c404904b3f5ffc7011204ce (patch) | |
tree | 3295aef69b5933420df1f68d73b666aee93d83be /src/firejail/firejail.h | |
parent | Do not try to set up default gateway without an IP address (diff) | |
download | firejail-d3d806ddb25249cf0c404904b3f5ffc7011204ce.tar.gz firejail-d3d806ddb25249cf0c404904b3f5ffc7011204ce.tar.zst firejail-d3d806ddb25249cf0c404904b3f5ffc7011204ce.zip |
Allow resolv.conf be written by dhclient
When dhclient is used to assign and IP to the container,
it should be able to overwrite resolv.conf
Therefore, we do the /etc mirroring similarly to the situation with
manually configured nameservers.
When both DHCP and manually set nameservers are in use,
warn that the manual ones will be overwritten
Diffstat (limited to 'src/firejail/firejail.h')
-rw-r--r-- | src/firejail/firejail.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index a5eeb4067..bfe680d24 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -239,6 +239,24 @@ static inline int any_interface_configured(void) { | |||
239 | return 0; | 239 | return 0; |
240 | } | 240 | } |
241 | 241 | ||
242 | static inline int any_ip_dhcp(void) { | ||
243 | if (cfg.bridge0.arg_ip_dhcp || cfg.bridge1.arg_ip_dhcp || cfg.bridge2.arg_ip_dhcp || cfg.bridge3.arg_ip_dhcp) | ||
244 | return 1; | ||
245 | else | ||
246 | return 0; | ||
247 | } | ||
248 | |||
249 | static inline int any_ip6_dhcp(void) { | ||
250 | if (cfg.bridge0.arg_ip6_dhcp || cfg.bridge1.arg_ip6_dhcp || cfg.bridge2.arg_ip6_dhcp || cfg.bridge3.arg_ip6_dhcp) | ||
251 | return 1; | ||
252 | else | ||
253 | return 0; | ||
254 | } | ||
255 | |||
256 | static inline int any_dhcp(void) { | ||
257 | return any_ip_dhcp() || any_ip6_dhcp(); | ||
258 | } | ||
259 | |||
242 | extern int arg_private; // mount private /home | 260 | extern int arg_private; // mount private /home |
243 | extern int arg_private_cache; // private home/.cache | 261 | extern int arg_private_cache; // private home/.cache |
244 | extern int arg_debug; // print debug messages | 262 | extern int arg_debug; // print debug messages |