aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_conntrack_ftp.c
diff options
context:
space:
mode:
authorGao Feng <fgao@ikuai8.com>2016-09-01 18:59:02 +0800
committerPablo Neira Ayuso <pablo@netfilter.org>2016-09-07 10:38:00 +0200
commitddb075b0cdbca140d6c6503db9cc9990d3461308 (patch)
tree61f75c9e94a8abb1cd1ea6acc1ca7676c892ac46 /net/netfilter/nf_conntrack_ftp.c
parentnetfilter: ftp: Remove the useless dlen==0 condition check in find_pattern (diff)
downloadlinux-dev-ddb075b0cdbca140d6c6503db9cc9990d3461308.tar.xz
linux-dev-ddb075b0cdbca140d6c6503db9cc9990d3461308.zip
netfilter: ftp: Remove the useless code
There are some debug code which are commented out in find_pattern by #if 0. Now remove them. Signed-off-by: Gao Feng <fgao@ikuai8.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_ftp.c')
-rw-r--r--net/netfilter/nf_conntrack_ftp.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index d49a2d410813..e3ed20060878 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -309,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