* [PATCH v2 iptables] connlabel: clarify default config path
@ 2016-07-20 22:23 Florian Westphal
2016-07-21 16:58 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2016-07-20 22:23 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
Pablo suggested to print full config file path for connlabel.conf
parsing errors.
Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
---
extensions/libxt_connlabel.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/extensions/libxt_connlabel.c b/extensions/libxt_connlabel.c
index 7e4ff26..2af5eca 100644
--- a/extensions/libxt_connlabel.c
+++ b/extensions/libxt_connlabel.c
@@ -34,6 +34,8 @@ static const struct xt_option_entry connlabel_mt_opts[] = {
*/
static void connlabel_open(void)
{
+ const char *fname;
+
if (map)
return;
@@ -41,12 +43,13 @@ static void connlabel_open(void)
if (map != NULL)
return;
+ fname = nfct_labels_get_path();
if (errno) {
xtables_error(RESOURCE_PROBLEM,
- "cannot open connlabel.conf: %s", strerror(errno));
+ "cannot open %s: %s", fname, strerror(errno));
} else {
xtables_error(RESOURCE_PROBLEM,
- "cannot parse label, maybe valid label map is empty");
+ "cannot parse %s: no labels found", fname);
}
}
--
2.7.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 iptables] connlabel: clarify default config path
2016-07-20 22:23 [PATCH v2 iptables] connlabel: clarify default config path Florian Westphal
@ 2016-07-21 16:58 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2016-07-21 16:58 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Thu, Jul 21, 2016 at 12:23:13AM +0200, Florian Westphal wrote:
> Pablo suggested to print full config file path for connlabel.conf
> parsing errors.
>
> Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org>
> Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-21 16:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-20 22:23 [PATCH v2 iptables] connlabel: clarify default config path Florian Westphal
2016-07-21 16:58 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).