summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMikael Magnusson <mikma@users.sourceforge.net>2023-11-25 23:36:44 +0100
committerMikael Magnusson <mikma@users.sourceforge.net>2023-11-25 23:36:44 +0100
commit9a3172260987d2fd2b70a90071128d0201cc2e8f (patch)
tree92774b42cf6b89468f7a1b2663d8587beac8653f /conf
parentf9c422250bd32978c104ffdc2a801be75dbf9068 (diff)
parent977b82fba49b22d9548546d88b105945921efaed (diff)
Merge commit '977b82fb' into wireguard-next-tmp7-1
Diffstat (limited to 'conf')
-rw-r--r--conf/conf.h3
-rw-r--r--conf/confbase.Y1
2 files changed, 4 insertions, 0 deletions
diff --git a/conf/conf.h b/conf/conf.h
index 486499ad..b07b417c 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -238,6 +238,9 @@ struct symbol *cf_new_symbol(struct sym_scope *scope, pool *p, struct linpool *l
sym_->var_ = def_; \
sym_; })
+#define cf_create_symbol(conf_, name_, type_, var_, def_) \
+ cf_define_symbol(conf_, cf_get_symbol(conf_, name_), type_, var_, def_)
+
void cf_push_scope(struct config *, struct symbol *);
void cf_pop_scope(struct config *);
void cf_push_soft_scope(struct config *);
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 0364bc6e..69a7676c 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -95,6 +95,7 @@ CF_DECLS
struct timeformat *tf;
mpls_label_stack *mls;
const struct adata *bs;
+ struct aggr_item_node *ai;
}
%token END CLI_MARKER INVALID_TOKEN ELSECOL DDOT