MAC and iptables-save

[Fridtjof Busse <fridtjof.busse@gmx.de>]

[-- Attachment #1: Type: text/plain, Size: 824 bytes --]

Hi
"iptables-restore" doesn't work if "iptables-save" saved a rule with "-m 
mac --mac-source"
To reproduce this:


Create a rule:
iptables -A INPUT -i eth0 -m mac --mac-source ! 00:01:02:03:04:05 -j 
REJECT

Save this rule:
iptables-save > test.iptables

Load the ruleset:
iptables-restore test.iptables
iptables-restore v1.2.7a: Bad mac address `!00:01:02:03:04:05'
Try `iptables-restore -h' or 'iptables-restore --help' for more

iptables-save doesn't add a space before it prints the mac-address, it 
looks like this:
-A INPUT -i wlan0 -m mac --mac !00:02:2D:5C:08:1B -j DROP

instead of:
-A INPUT -i wlan0 -m mac --mac ! 00:02:2D:5C:08:1B -j DROP


Fix attached, since this bug seems to be still in the CVS.

-- 
Fridtjof Busse
BOFH excuse #63:
not properly grounded, please bury computer

[-- Attachment #2: iptables-1.2.7a-mac.diff --]
[-- Type: text/x-diff, Size: 691 bytes --]

--- extensions/libipt_mac.c.orig	Fri Nov  8 18:20:48 2002
+++ extensions/libipt_mac.c	Fri Nov  8 18:22:48 2002
@@ -90,7 +90,7 @@
 {
 	unsigned int i;
 
-	printf("%s%02X", invert ? "!" : "", macaddress[0]);
+	printf("%s %02X", invert ? "!" : "", macaddress[0]);
 	for (i = 1; i < ETH_ALEN; i++)
 		printf(":%02X", macaddress[i]);
 	printf(" ");
--- extensions/libip6t_mac.c.orig	Fri Nov  8 18:23:10 2002
+++ extensions/libip6t_mac.c	Fri Nov  8 18:23:31 2002
@@ -90,7 +90,7 @@
 {
 	unsigned int i;
 
-	printf("%s%02X", invert ? "!" : "", macaddress[0]);
+	printf("%s %02X", invert ? "!" : "", macaddress[0]);
 	for (i = 1; i < ETH_ALEN; i++)
 		printf(":%02X", macaddress[i]);
 	printf(" ");