libxtables: Display weird character warning for wildcards

Change the scope of the weird character check loop so that
it checks for invalid characters when the interface name
contains a wildcard.

Fixes Bugzilla #1085.

Signed-off-by: Oliver Ford <ojford@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@gnumonks.org>

diff --git a/libxtables/xtables.c b/libxtables/xtables.c
index 891d81a7fb0dd6d859c06741385c0948b34599ee..57a11022ab6c8c70a01791da39f6b54d27aa76d4 100644 (file)
--- a/libxtables/xtables.c
+++ b/libxtables/xtables.c
@@ -538,15 +538,15 @@ void xtables_parse_interface(const char *arg, char *vianame,
        } else {
                /* Include nul-terminator in match */
                memset(mask, 0xFF, vialen + 1);
-               for (i = 0; vianame[i]; i++) {
-                       if (vianame[i] == '/' ||
-                           vianame[i] == ' ') {
-                               fprintf(stderr,
-                                       "Warning: weird character in interface"
-                                       " `%s' ('/' and ' ' are not allowed by the kernel).\n",
-                                       vianame);
-                               break;
-                       }
+       }
+
+       /* Display warning on invalid characters */
+       for (i = 0; vianame[i]; i++) {
+               if (vianame[i] == '/' || vianame[i] == ' ') {
+                       fprintf(stderr, "Warning: weird character in interface"
+                               " `%s' ('/' and ' ' are not allowed by the kernel).\n",
+                               vianame);
+                       break;
                }
        }
 }