networking fixes

3 files changed, 15 insertions, 7 deletions

diff --git a/src/firejail/network_main.c b/src/firejail/network_main.c
index e6d5cd5d7..e50c06ae9 100644
--- a/src/firejail/network_main.c
+++ b/src/firejail/network_main.c
@@ -56,9 +56,12 @@ void net_configure_bridge(Bridge *br, char *dev_name) {
                 }
         }
 
+        // allow unconfigured interfaces
         if (net_get_if_addr(br->dev, &br->ip, &br->mask, br->mac, &br->mtu)) {
-                fprintf(stderr, "Error: interface %s is not configured\n", br->dev);
-                exit(1);
+                fprintf(stderr, "Warning: interface %s is not configured\n", br->dev);
+                br->configured = 1;
+                br->arg_ip_none = 1;
+                return;
         }
         if (arg_debug) {
                 if (br->macvlan == 0)
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 7b22a5bf2..3c4de9ed5 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -460,6 +460,11 @@ in case you intend to start an external DHCP client in the sandbox.
 Example:
 .br
 $ firejail \-\-net=eth0 \-\-\ip=none
+.br
+
+.br
+If the coresponding interface doesn't have an IP address configured, this
+option is enabled by default.
 
 .TP
 \fB\-\-ip6=address
diff --git a/test/network/README b/test/network/README
index 27e5667a2..a9b79d1de 100644
--- a/test/network/README
+++ b/test/network/README
@@ -1,11 +1,11 @@
-Warning: this test requires root access to configure a number of bridge, macvlan and
-vlan devices. Please take a look at configure file. By the time you are finished testing,
-you'll probably have to reboot the computer to get your networking subsytem
-back to normal.
+Warning: this test requires root access to configure a number of bridge, mac
+and vlan devices. Please take a look at configure file. By the time  you are
+finished testing, you'll probably have to reboot the computer to get your
+networking subsytem back to normal.
 
 Limitations - to be investigated and fixed:
         - the test is assuming an eth0 wired interface to be present
-        - using netstat and ifconfig - this needs to be moved to iproute2 utilities
+        - using netstat and ifconfig - this needs to be moved to iproute2
         - configure script inserts an entry in system netfilter configuration
         - the test will probably not work on grsecurity settings
         - macvlan interfaces don't seem to work correctly under VirtualBox