On Wed, Jul 20, 2016 at 12:17:05PM +0200, Florian Westphal wrote:
> Instead of using /etc/xtables use the nftables syconfdir.
> Also update error message to tell which label failed translation
> and which config file was used for this:
>
> nft add filter input ct label foo
> <cmdline>:1:27-29: Error: /etc/nftables/connlabel.conf: could not parse conntrack label "foo"
>
> Suggested-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
> Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
> ---
> src/Makefile.am | 2 ++
> src/ct.c | 7 +++++--
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 8c59449..ff1dd6e 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -27,6 +27,8 @@ parser_bison.o scanner.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-decl
>
> BUILT_SOURCES = parser_bison.h
>
> +ct.o: AM_CFLAGS += -DCONNLABEL_PATH="\"${sysconfdir}/\""
I think we can simplify this by using DEFAULT_INCLUDE_PATH.
See patch attached, it applies on top of this one. Feel free to
collapse them.
diff --git a/src/Makefile.am b/src/Makefile.am
index ff1dd6e..8c59449 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,8 +27,6 @@ parser_bison.o scanner.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-decl
BUILT_SOURCES = parser_bison.h
-ct.o: AM_CFLAGS += -DCONNLABEL_PATH="\"${sysconfdir}/\""
-
nft_SOURCES = main.c \
rule.c \
statement.c \
diff --git a/src/ct.c b/src/ct.c
index e974307..f383f29 100644
--- a/src/ct.c
+++ b/src/ct.c
@@ -29,7 +29,7 @@
#include <utils.h>
#include <statement.h>
-#define CONNLABEL_CONF CONNLABEL_PATH "connlabel.conf"
+#define CONNLABEL_CONF DEFAULT_INCLUDE_PATH "connlabel.conf"
static const struct symbol_table ct_state_tbl = {
.symbols = {
@@ -130,8 +130,8 @@ static struct error_record *ct_label_type_parse(const struct expr *sym,
dtype = sym->dtype;
if (s->identifier == NULL)
- return error(&sym->location, "%s: could not parse %s \"%s\"", CONNLABEL_CONF,
- dtype->desc, sym->identifier);
+ return error(&sym->location, "%s: could not parse %s \"%s\"",
+ CONNLABEL_CONF, dtype->desc, sym->identifier);
if (s->value >= CT_LABEL_BIT_SIZE)
return error(&sym->location, "%s: out of range (%u max)",
