Changeset 961:d95cd3ca9e8d in freeDiameter for extensions/acl_wl/aw_conf.y

Timestamp:

Mar 7, 2013, 4:09:54 AM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Parents:

960:f39fa6cd86e0 (diff), 933:04f590da5821 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

merge latest 1.1 branch (one commit post 1.1.6)

Files:

• extensions/acl_wl/aw_conf.y (modified) (1 diff)
• extensions/acl_wl/aw_conf.y (modified) (2 diffs)

extensions/acl_wl/aw_conf.y

@@ -35 +35 @@
 
 /* Yacc extension's configuration parser.
- * See doc/app_test.conf.sample for configuration file format
+ * See doc/acl_wl.conf.sample for configuration file format
  */
 

extensions/acl_wl/aw_conf.y

@@ -3 +3 @@
 * Author: Sebastien Decugis <sdecugis@freediameter.net>                                                  *
 *                                                                                                        *
-* Copyright (c) 2011, WIDE Project and NICT                                                              *
+* Copyright (c) 2013, WIDE Project and NICT                                                              *
 * All rights reserved.                                                                                   *
 *                                                                                                        *
@@ -127 +127 @@
                                 fqdn_added++;
                         }
+                        | conffile LEX_ERROR
+                        {
+                                yyerror(&yylloc, conffile, "An error occurred while parsing the configuration file");
+                                return EINVAL;
+                        }
                         ;