summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkn <kn@cvs.openbsd.org>2018-11-10 21:22:18 +0000
committerkn <kn@cvs.openbsd.org>2018-11-10 21:22:18 +0000
commit4f714e560b746084894eb5f9fcded9b711732d7d (patch)
tree66bfc901ceeeb35e244088b35dfe1834bea3f378
parentc63e0ce18f882a4fef20de26696a4ecd8a3c2c59 (diff)
Unbreak `-D macro=value' (r1.686 regression)
Zap trailing semicolon introduced with miko's cmdline_symset() leading to unconditional err(3). Zap trailing tab while here.
-rw-r--r--sbin/pfctl/parse.y6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index d0ed6c4c4b3..114eb139838 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.686 2018/11/07 08:10:45 miko Exp $ */
+/* $OpenBSD: parse.y,v 1.687 2018/11/10 21:22:17 kn Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -5564,8 +5564,8 @@ pfctl_cmdline_symset(char *s)
if ((val = strrchr(s, '=')) == NULL)
return (-1);
- sym = strndup(s, val - s);
- if (sym == NULL);
+ sym = strndup(s, val - s);
+ if (sym == NULL)
err(1, "%s", __func__);
ret = symset(sym, val + 1, 1);
free(sym);