changelog: start 0.6.8

[secnet.git] / conffile.fl

diff --git a/conffile.fl b/conffile.fl
index 7228c9e8fa6cd672ea5a3ac480d8328fc161cede..6b0259cdeccb58f07eaa4959ffb9e41b757aa033 100644 (file)
--- a/conffile.fl
+++ b/conffile.fl
@@ -1,9 +1,28 @@
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
 /* the "incl" state is used for picking up the name of an include file */
 %x incl
 
 %option nounput
 %option noinput
 %option never-interactive
+%option noyywrap
 
 %{
 #include <assert.h>
@@ -42,7 +61,7 @@ static struct p_node *leafnode(uint32_t type)
 {
        struct p_node *r;
 
-       r=safe_malloc(sizeof(*r),"leafnode");
+       NEW(r);
        r->type=type;
        r->loc.file=config_file;
        r->loc.line=config_lineno;
@@ -151,4 +170,3 @@ include                     BEGIN(incl);
 
        /* Return all unclaimed single characters to the parser */
 .                      return *yytext;
-