| Message ID | 1469053393-11397-1-git-send-email-fw@strlen.de |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
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> -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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); } }
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(-)