Patchwork netfilter 25/29: nf_conntrack_ftp: change "partial ..." message to pr_debug()

login
register
mail settings
Submitter Patrick McHardy
Date Nov. 27, 2008, 4:15 p.m.
Message ID <20081127161536.13891.30643.sendpatchset@x2.localnet>
Download mbox | patch
Permalink /patch/11226/
State Accepted
Delegated to: David Miller
Headers show

Comments

Patrick McHardy - Nov. 27, 2008, 4:15 p.m.
commit 4813eadf6b17caa7fcce67ac2f929a3dd5178fa2
Author: Patrick McHardy <kaber@trash.net>
Date:   Mon Nov 24 18:34:48 2008 +0100

    netfilter: nf_conntrack_ftp: change "partial ..." message to pr_debug()
    
    The message triggers when sending non-FTP data on port 21 or with
    certain clients that use multiple syscalls to send the command.
    
    Change to pr_debug() since users have been complaining.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index 703a437..867cad6 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -428,10 +428,8 @@  static int help(struct sk_buff *skb,
 		   connection tracking, not packet filtering.
 		   However, it is necessary for accurate tracking in
 		   this case. */
-		if (net_ratelimit())
-			printk("conntrack_ftp: partial %s %u+%u\n",
-			       search[dir][i].pattern,
-			       ntohl(th->seq), datalen);
+		pr_debug("conntrack_ftp: partial %s %u+%u\n",
+			 search[dir][i].pattern,  ntohl(th->seq), datalen);
 		ret = NF_DROP;
 		goto out;
 	} else if (found == 0) { /* No match */