[netfilter-cvslog] [IPtables] branch, master, updated. svn_t_iptables_1_4_0rc1-141-g59e9559

[Patrick McHardy]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=59e95596298a51659f62087d5c7581722cc53f97
Commit:		59e95596298a51659f62087d5c7581722cc53f97
Parent:		b0121dbfc5e0a2a9c50fc5c81d07d5ebcfd73785

The branch, master has been updated
       via  59e95596298a51659f62087d5c7581722cc53f97 (commit)
      from  b0121dbfc5e0a2a9c50fc5c81d07d5ebcfd73785 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 59e95596298a51659f62087d5c7581722cc53f97
Author: Jamie Strandboge <jamie at ubuntu.com>
Date:   Fri May 16 14:52:12 2008 +0200

    [PATCH]: fix ip6tables dest address printing
    
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=464244
    
    ip6tables improperly displays the destination address when the address
    is longer than 18 characters.  Here is example output:
    ...
    DROP       tcp      2001:db8::/32        2001:db8:3:4:5:6:7:8/128tcp spt:25
    ...
    
    Proper formatting should have a space between '2001:db8:3:4:5:6:7:8/128'
    and 'tcp'.
    
    Signed-off-by: Jamie Strandboge <jamie at ubuntu.com>
    Signed-off-by: Lawrence J. Lane <ljlane at debian.org>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

-----------------------------------------------------------------------

commit 59e95596298a51659f62087d5c7581722cc53f97
Author: Jamie Strandboge <jamie at ubuntu.com>
Date:   Fri May 16 14:52:12 2008 +0200

    [PATCH]: fix ip6tables dest address printing
    
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=464244
    
    ip6tables improperly displays the destination address when the address
    is longer than 18 characters.  Here is example output:
    ...
    DROP       tcp      2001:db8::/32        2001:db8:3:4:5:6:7:8/128tcp spt:25
    ...
    
    Proper formatting should have a space between '2001:db8:3:4:5:6:7:8/128'
    and 'tcp'.
    
    Signed-off-by: Jamie Strandboge <jamie at ubuntu.com>
    Signed-off-by: Lawrence J. Lane <ljlane at debian.org>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

diff --git a/ip6tables.c b/ip6tables.c
index 9b68fba..8e135f1 100644
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -810,14 +810,14 @@ print_firewall(const struct ip6t_entry *fw,
 	fputc(fw->ipv6.invflags & IP6T_INV_DSTIP ? '!' : ' ', stdout);
 	if (!memcmp(&fw->ipv6.dmsk, &in6addr_any, sizeof in6addr_any)
 	    && !(format & FMT_NUMERIC))
-		printf(FMT("%-19s","-> %s"), "anywhere");
+		printf(FMT("%-19s ","-> %s"), "anywhere");
 	else {
 		if (format & FMT_NUMERIC)
 			sprintf(buf, "%s", ip6addr_to_numeric(&fw->ipv6.dst));
 		else
 			sprintf(buf, "%s", ip6addr_to_anyname(&fw->ipv6.dst));
 		strcat(buf, ip6mask_to_numeric(&fw->ipv6.dmsk));
-		printf(FMT("%-19s","-> %s"), buf);
+		printf(FMT("%-19s ","-> %s"), buf);
 	}
 
 	if (format & FMT_NOTABLE)


hooks/post-receive
--
IPtables