diff options
| author |   sashan <sashan@openbsd.org> | 2018-11-01 00:18:44 +0000 |
|---|---|---|
| committer | sashan <sashan@openbsd.org> | 2018-11-01 00:18:44 +0000 |
| commit | a1533359581417afa5cac550127d8aa8920ae72a (patch) | |
| tree | 35d3e162fa800af4d75486f412baec0aaa0ff490 /usr.sbin/relayd | |
| parent | Add comment to remind people to bump libc++. (diff) | |
| download | wireguard-openbsd-a1533359581417afa5cac550127d8aa8920ae72a.tar.xz wireguard-openbsd-a1533359581417afa5cac550127d8aa8920ae72a.zip | |
- 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/relayd')
| -rw-r--r-- | usr.sbin/relayd/parse.y | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 06789862a91..42fd6df618c 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.229 2018/10/22 07:08:01 denis Exp $ */ +/* $OpenBSD: parse.y,v 1.230 2018/11/01 00:18:44 sashan Exp $ */ /* * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -2518,7 +2518,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++; |