From b73f069c5a958d3ffd6f3aec8c966f0a26130d44 Mon Sep 17 00:00:00 2001 From: Gilles Chehade Date: Mon, 19 Oct 2009 21:09:56 +0000 Subject: change virtual rule so that it reads: accept for virtual "mapname", instead of: accept for virtual map "mapname" ... discussed with jacekm@ --- usr.sbin/smtpd/parse.y | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'usr.sbin/smtpd') 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 @@ -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; -- cgit v1.2.3