libxt_recent: Remove ineffective checks for info->name

In struct xt_recent_mtinfo{,_v1}, field 'name' is an array, not a
pointer. So there is no point in comparing it against NULL. Changing the
check to make sure it's content is not an empty string is pointless
either, since a non-empty default string is used and the argument parser
will refuse empty strings as --name argument. So simply get rid of the
checks altogether.

Backport commit:
https://git.netfilter.org/iptables/commit/?id=d0e3d95fa3442c6ff32f7fed3e0d2eeb2248ef9f

Change-Id: I59efe3f354b4235c976497c1cad85b01a73cd867
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/extensions/libxt_recent.c b/extensions/libxt_recent.c
index e1801f1..055ae35 100644 (file)
--- a/extensions/libxt_recent.c
+++ b/extensions/libxt_recent.c
@@ -199,7 +199,7 @@ static void recent_print(const void *ip, const struct xt_entry_match *match,
        if(info->hit_count) printf(" hit_count: %d", info->hit_count);
        if (info->check_set & XT_RECENT_TTL)
                printf(" TTL-Match");
-       if(info->name) printf(" name: %s", info->name);
+       printf(" name: %s", info->name);
        if (info->side == XT_RECENT_SOURCE)
                printf(" side: source");
        if (info->side == XT_RECENT_DEST)
@@ -239,7 +239,7 @@ static void recent_save(const void *ip, const struct xt_entry_match *match,
        if(info->hit_count) printf(" --hitcount %d", info->hit_count);
        if (info->check_set & XT_RECENT_TTL)
                printf(" --rttl");
-       if(info->name) printf(" --name %s",info->name);
+       printf(" --name %s",info->name);
 
        switch(family) {
        case NFPROTO_IPV4: