connlabel: clarify default config path
Florian Westphal
maintainerPATCH 1/1 connlabel: clarify default config path
Pablo suggested to print full config file path for connlabel.conf parsing errors.
---
Pablo,
I could also add the suggested nfct_labels_get_path() to lnf_conntrack but that means next iptables-release depends on a new library version. Given this name is set in stone anyway I would prefer this patch instead.
Let me know, thanks.
I will send a separate patch to change nftables location.
extensions/libxt_connlabel.c +4 -2
@@ -34,6 +34,8 @@ static const struct xt_option_entry connlabel_mt_opts[] = {*/ static void connlabel_open (void ) { +static const char fname[]="/etc/xtables/connlabel.conf" ; +if (map)return ;
@@ -43,10 +45,10 @@ static void connlabel_open(void)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); } }
Signature · 1 line
2.7.3
Pablo Neira Ayuso
maintainerQuoted 7 lines · Florian Westphal
Pablo suggested to print full config file path for connlabel.conf parsing errors.
Signed-off-by Florian Westphal <[email protected]>---
Pablo,
Quoted 6 lines
I could also add the suggested
nfct_labels_get_path()tolnf_conntrackbut that means next iptables-release depends on a new library version. Given this name is set in stone anyway I would prefer this patch instead.Let me know, thanks.
I will send a separate patch to change nftables location.
We'll have a release of iptables 1.6.1 soon. Pablo Bermudo is working on making sure that the interaction between nftables and iptables-compat is fine.
And libnetfilter_conntrack is coming with IPv6 NAT support.
So I can schedule a release before end of this week / beginning next weekend with accumulated updates so this comes in the next release.
Thanks for working on this!
Florian Westphal
maintainerQuoted 1 line · Pablo Neira Ayuso
And
libnetfilter_conntrackis coming with IPv6 NAT support.
Ah, I forgot about this.
Quoted 2 lines
So I can schedule a release before end of this week / beginning next weekend with accumulated updates so this comes in the next release.
Ok, I will send a patch for lnf-conntrack and iptables later today.