settings: Merge quoted strings that span multiple lines

diff --git a/src/libstrongswan/settings/settings_lexer.l b/src/libstrongswan/settings/settings_lexer.l
index c6546f464326d4078b819f2397b263027a1c58d0..176387f1f417549ce3c99f64b5396a517189a270 100644 (file)
--- a/src/libstrongswan/settings/settings_lexer.l
+++ b/src/libstrongswan/settings/settings_lexer.l
@@ -148,9 +148,8 @@ static void include_files(parser_helper_t *ctx);
        \\t     yyextra->string_add(yyextra, "\t");
        \\b     yyextra->string_add(yyextra, "\b");
        \\f     yyextra->string_add(yyextra, "\f");
-       \\(.|\n)                        {
-               yyextra->string_add(yyextra, yytext+1);
-       }
+       \\\r?\n /* merge lines that end with EOL characters */
+       \\.     yyextra->string_add(yyextra, yytext+1);
        [^\\\n"]+                       {
                yyextra->string_add(yyextra, yytext);
        }