diff options
| author |  netblue30 <netblue30@yahoo.com> | 2016-08-14 08:44:39 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-14 08:44:39 -0400 |
| commit | a6a73adcfdad090e3e2c8706ecd0ec7d6583d17d (patch) | |
| tree | 10633eaa57e0752547965bd06da361b6624912be | |
| parent | various fixes (diff) | |
| parent | typo (diff) | |
| download | firejail-a6a73adcfdad090e3e2c8706ecd0ec7d6583d17d.tar.gz firejail-a6a73adcfdad090e3e2c8706ecd0ec7d6583d17d.tar.zst firejail-a6a73adcfdad090e3e2c8706ecd0ec7d6583d17d.zip | |
Merge pull request #711 from Fred-Barclay/sandy_shores
Sandy shores
| -rw-r--r-- | src/firejail/network.txt | 2 | ||||
| -rwxr-xr-x | test/network/net_arp.exp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/firejail/network.txt b/src/firejail/network.txt index 673d5b941..f6df0f485 100644 --- a/src/firejail/network.txt +++ b/src/firejail/network.txt | |||
| @@ -13,7 +13,7 @@ net_configure_bridge(br, device) { | |||
| 13 | } | 13 | } |
| 14 | 14 | ||
| 15 | net_configure_sandbox_ip(br) { | 15 | net_configure_sandbox_ip(br) { |
| 16 | if br->ip_snadbox | 16 | if br->ip_sandbox |
| 17 | check br->ipsandbox inside the bridge network | 17 | check br->ipsandbox inside the bridge network |
| 18 | arp_check(br->ipsandbox) // send an arp req to check if anybody else is using this address | 18 | arp_check(br->ipsandbox) // send an arp req to check if anybody else is using this address |
| 19 | else | 19 | else |
diff --git a/test/network/net_arp.exp b/test/network/net_arp.exp index f27f85814..fdd30f218 100755 --- a/test/network/net_arp.exp +++ b/test/network/net_arp.exp | |||
| @@ -69,6 +69,6 @@ expect { | |||
| 69 | "sleep 20" | 69 | "sleep 20" |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | # wait for snadboxes to be shutdown | 72 | # wait for sandboxes to be shutdown |
| 73 | sleep 30 | 73 | sleep 30 |
| 74 | puts "\n" | 74 | puts "\n" |