summaryrefslogtreecommitdiff
path: root/usr.sbin/vmd
diff options
context:
space:
mode:
authorAlexandr Nedvedicky <sashan@cvs.openbsd.org>2018-11-01 00:18:45 +0000
committerAlexandr Nedvedicky <sashan@cvs.openbsd.org>2018-11-01 00:18:45 +0000
commitd9c4b687773fa49c79bfbeddfe9b559a3b48cc06 (patch)
treed865892bf5acdee6e738f603e26ce85842cab0f4 /usr.sbin/vmd
parent44350b70db3560f32688395cbd6b4af5561520b7 (diff)
- odd condition/test in PF lexer
(and other lexers too) This commit rectifies earlier change: in the lex... even inside quotes, a \ followed by space or tab should expand to space or tab, and a \ followed by newline should be ignored (as a line continuation). compatible with the needs of hoststated (which has the most strict quoted string requirements), and ifstated (where one commonly does line continuations in strings). OK deraadt@, OK millert@
Diffstat (limited to 'usr.sbin/vmd')
-rw-r--r--usr.sbin/vmd/parse.y5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/vmd/parse.y b/usr.sbin/vmd/parse.y
index ef2ed38e400..6f1544fbea7 100644
--- a/usr.sbin/vmd/parse.y
+++ b/usr.sbin/vmd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.47 2018/10/22 16:45:24 bluhm Exp $ */
+/* $OpenBSD: parse.y,v 1.48 2018/11/01 00:18:44 sashan Exp $ */
/*
* Copyright (c) 2007-2016 Reyk Floeter <reyk@openbsd.org>
@@ -949,7 +949,8 @@ top:
} else if (c == '\\') {
if ((next = lgetc(quotec)) == EOF)
return (0);
- if (next == quotec || c == ' ' || c == '\t')
+ if (next == quotec || next == ' ' ||
+ next == '\t')
c = next;
else if (next == '\n') {
file->lineno++;