Merge remote-tracking branch 'netfilter-next/master'

[deliverable/linux.git] / net / netfilter / nf_conntrack_ftp.c

diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index b6934b5edf7a0afff352435ca96d1e75e897dfe3..e3ed200608788bc5e8dc96a14b8674d0fbaa7d4b 100644 (file)
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -301,8 +301,6 @@ static int find_pattern(const char *data, size_t dlen,
        size_t i = plen;
 
        pr_debug("find_pattern `%s': dlen = %Zu\n", pattern, dlen);
-       if (dlen == 0)
-               return 0;
 
        if (dlen <= plen) {
                /* Short packet: try for partial? */
@@ -311,19 +309,8 @@ static int find_pattern(const char *data, size_t dlen,
                else return 0;
        }
 
-       if (strncasecmp(data, pattern, plen) != 0) {
-#if 0
-               size_t i;
-
-               pr_debug("ftp: string mismatch\n");
-               for (i = 0; i < plen; i++) {
-                       pr_debug("ftp:char %u `%c'(%u) vs `%c'(%u)\n",
-                                i, data[i], data[i],
-                                pattern[i], pattern[i]);
-               }
-#endif
+       if (strncasecmp(data, pattern, plen) != 0)
                return 0;
-       }
 
        pr_debug("Pattern matches!\n");
        /* Now we've found the constant string, try to skip