diff --git a/Shorewall-docs/errata.xml b/Shorewall-docs/errata.xml
index 6140f2baf..b0c4c2d77 100644
--- a/Shorewall-docs/errata.xml
+++ b/Shorewall-docs/errata.xml
@@ -81,9 +81,14 @@
Unexplained errors may occur during "shorewall
[re]start" when the /etc/shorewall/masq file is being processed.
+
+
+ The maclist interface option
+ previously wasn't available on Atheros WiFi cards.
+
- This problem has been corrected in These problems have been corrected in this
firewall script which may be installed in
/usr/share/shorewall/firewall as described above.
diff --git a/Shorewall-docs/myfiles.xml b/Shorewall-docs/myfiles.xml
index e0707ceea..75acf2c68 100644
--- a/Shorewall-docs/myfiles.xml
+++ b/Shorewall-docs/myfiles.xml
@@ -563,5 +563,89 @@ iface eth1 inet static
...
+
+
+ /etc/dhcpd.conf (MAC Addresses Omitted)
+
+
+ While this is a little off-topic, I've included it to show
+ how to set up DHCP on two interfaces.default-lease-time 67200; max-lease-time 67200;
+get-lease-hostnames on;
+
+group {
+ option subnet-mask 255.255.255.0;
+ option broadcast-address 192.168.1.255;
+ option routers 192.168.1.254;
+ option ntp-servers 192.168.1.254;
+ option domain-name-servers 192.168.1.193;
+ option netbios-name-servers 192.168.1.254;
+ option domain-name "shorewall.net";
+ option netbios-dd-server 192.168.1.254;
+ option netbios-node-type 8;
+ option netbios-scope "";
+
+ subnet 192.168.1.0 netmask 255.255.255.0 {
+ range 192.168.1.11 192.168.1.20;
+ }
+
+ host ursa.shorewall.net {
+ hardware ethernet …;
+ fixed-address 192.168.1.5;
+ }
+
+ host eastept1 {
+ hardware ethernet …;
+ fixed-address 192.168.1.7;
+ }
+
+ host tarry {
+ hardware ethernet …;
+ fixed-address 192.168.1.4;
+ }
+
+ host wookie.shorewall.net {
+ hardware ethernet …;
+ fixed-address 192.168.1.3;
+ }
+
+ host testws.shorewall.net {
+ hardware ethernet …;
+ fixed-address 192.168.1.6;
+ }
+
+ host printer.shorewall.net {
+ hardware ethernet …;
+ fixed-address 192.168.1.10;
+ }
+
+}
+
+group {
+ option subnet-mask 255.255.255.0;
+ option broadcast-address 192.168.3.255;
+ option routers 192.168.3.254;
+ option ntp-servers 192.168.3.254;
+ option domain-name-servers 206.124.146.177;
+ option netbios-name-servers 192.168.3.254;
+ option domain-name "shorewall.net";
+ option netbios-dd-server 192.168.3.254;
+ option netbios-node-type 8;
+ option netbios-scope "";
+
+ subnet 192.168.3.0 netmask 255.255.255.0 {
+ range 192.168.3.11 192.168.3.20;
+ }
+
+ host easteplaptop {
+ hardware ethernet …;
+ fixed-address 192.168.3.7;
+ }
+
+ host tipper.shorewall.net {
+ hardware ethernet …;
+ fixed-address 192.168.3.8;
+ }
+
+
\ No newline at end of file
diff --git a/Shorewall-docs/myfiles2.xml b/Shorewall-docs/myfiles2.xml
index 68af74a7c..3cab2e321 100644
--- a/Shorewall-docs/myfiles2.xml
+++ b/Shorewall-docs/myfiles2.xml
@@ -619,5 +619,89 @@ iface eth1 inet static
...
+
+
+ /etc/dhcpd.conf (MAC Addresses Omitted)
+
+
+ While this is a little off-topic, I've included it to show
+ how to set up DHCP on two interfaces.default-lease-time 67200; max-lease-time 67200;
+get-lease-hostnames on;
+
+group {
+ option subnet-mask 255.255.255.0;
+ option broadcast-address 192.168.1.255;
+ option routers 192.168.1.254;
+ option ntp-servers 192.168.1.254;
+ option domain-name-servers 192.168.1.193;
+ option netbios-name-servers 192.168.1.254;
+ option domain-name "shorewall.net";
+ option netbios-dd-server 192.168.1.254;
+ option netbios-node-type 8;
+ option netbios-scope "";
+
+ subnet 192.168.1.0 netmask 255.255.255.0 {
+ range 192.168.1.11 192.168.1.20;
+ }
+
+ host ursa.shorewall.net {
+ hardware ethernet …;
+ fixed-address 192.168.1.5;
+ }
+
+ host eastept1 {
+ hardware ethernet …;
+ fixed-address 192.168.1.7;
+ }
+
+ host tarry {
+ hardware ethernet …;
+ fixed-address 192.168.1.4;
+ }
+
+ host wookie.shorewall.net {
+ hardware ethernet …;
+ fixed-address 192.168.1.3;
+ }
+
+ host testws.shorewall.net {
+ hardware ethernet …;
+ fixed-address 192.168.1.6;
+ }
+
+ host printer.shorewall.net {
+ hardware ethernet …;
+ fixed-address 192.168.1.10;
+ }
+
+}
+
+group {
+ option subnet-mask 255.255.255.0;
+ option broadcast-address 192.168.3.255;
+ option routers 192.168.3.254;
+ option ntp-servers 192.168.3.254;
+ option domain-name-servers 206.124.146.177;
+ option netbios-name-servers 192.168.3.254;
+ option domain-name "shorewall.net";
+ option netbios-dd-server 192.168.3.254;
+ option netbios-node-type 8;
+ option netbios-scope "";
+
+ subnet 192.168.3.0 netmask 255.255.255.0 {
+ range 192.168.3.11 192.168.3.20;
+ }
+
+ host easteplaptop {
+ hardware ethernet …;
+ fixed-address 192.168.3.7;
+ }
+
+ host tipper.shorewall.net {
+ hardware ethernet …;
+ fixed-address 192.168.3.8;
+ }
+
+
\ No newline at end of file