From bb0577a1e423a4d5ec9730e47e43ebb8f99949d1 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Thu, 16 Jun 2011 17:01:10 +0200
Subject: [PATCH] --- yaml --- r: 255559 b: refs/heads/master c:
 1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3 h: refs/heads/master i:   255557:
 774ddb6036396da7df9812b3ecc18d53f4ef1d4a   255555:
 cb1500e3db1e0d93973860333374d257968aafa4   255551:
 fcd8af43844f9d4c7494bb960dbcff9ff3626245 v: v3

---
 [refs]                      |  2 +-
 trunk/net/netfilter/xt_CT.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index df1e10b71662..4f018d6a6a6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 520b2756d9414cb6b0f6fc70714e95ee9248ebf4
+refs/heads/master: 1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3
diff --git a/trunk/net/netfilter/xt_CT.c b/trunk/net/netfilter/xt_CT.c
index 782e51986a6f..0221d10de75a 100644
--- a/trunk/net/netfilter/xt_CT.c
+++ b/trunk/net/netfilter/xt_CT.c
@@ -5,7 +5,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/module.h>
 #include <linux/gfp.h>
 #include <linux/skbuff.h>
@@ -95,8 +95,11 @@ static int xt_ct_tg_check(const struct xt_tgchk_param *par)
 	if (info->helper[0]) {
 		ret = -ENOENT;
 		proto = xt_ct_find_proto(par);
-		if (!proto)
+		if (!proto) {
+			pr_info("You must specify a L4 protocol, "
+				"and not use inversions on it.\n");
 			goto err3;
+		}
 
 		ret = -ENOMEM;
 		help = nf_ct_helper_ext_add(ct, GFP_KERNEL);
@@ -107,8 +110,10 @@ static int xt_ct_tg_check(const struct xt_tgchk_param *par)
 		help->helper = nf_conntrack_helper_try_module_get(info->helper,
 								  par->family,
 								  proto);
-		if (help->helper == NULL)
+		if (help->helper == NULL) {
+			pr_info("No such helper \"%s\"\n", info->helper);
 			goto err3;
+		}
 	}
 
 	__set_bit(IPS_TEMPLATE_BIT, &ct->status);