summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgilles <gilles@openbsd.org>2009-10-19 21:09:55 +0000
committergilles <gilles@openbsd.org>2009-10-19 21:09:55 +0000
commit9210f0eae34a8fdb9b28b26059d5fe496ba5b8d4 (patch)
tree2d9441aac3640211fa832e1e9c148d37c7479b2b
parentsync to 1.9.7: the same function was declared in two different headers; (diff)
downloadwireguard-openbsd-9210f0eae34a8fdb9b28b26059d5fe496ba5b8d4.tar.xz
wireguard-openbsd-9210f0eae34a8fdb9b28b26059d5fe496ba5b8d4.zip
change virtual rule so that it reads: accept for virtual "mapname", instead
of: accept for virtual map "mapname" ... discussed with jacekm@
-rw-r--r--usr.sbin/smtpd/parse.y12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y
index 182ff251089..a9668a397ef 100644
--- a/usr.sbin/smtpd/parse.y
+++ b/usr.sbin/smtpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.42 2009/10/19 20:48:13 gilles Exp $ */
+/* $OpenBSD: parse.y,v 1.43 2009/10/19 21:09:55 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -663,16 +663,16 @@ condition : NETWORK mapref {
c->c_map = $2;
$$ = c;
}
- | VIRTUAL MAP STRING {
+ | VIRTUAL STRING {
struct cond *c;
struct map *m;
- if ((m = map_findbyname(conf, $3)) == NULL) {
- yyerror("no such map: %s", $3);
- free($3);
+ if ((m = map_findbyname(conf, $2)) == NULL) {
+ yyerror("no such map: %s", $2);
+ free($2);
YYERROR;
}
- free($3);
+ free($2);
m->m_flags |= F_USED;