summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgilles <gilles@openbsd.org>2018-09-05 08:47:34 +0000
committergilles <gilles@openbsd.org>2018-09-05 08:47:34 +0000
commit03e03c0f78b3f0e329ecdc6f14bdf48d6458825f (patch)
treef2e46fe6729e74b1aca4a792161e93a0ac3eff3a
parentUse error label in host_if() (diff)
downloadwireguard-openbsd-03e03c0f78b3f0e329ecdc6f14bdf48d6458825f.tar.xz
wireguard-openbsd-03e03c0f78b3f0e329ecdc6f14bdf48d6458825f.zip
rename token to match naming convention
ok eric@
-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 914bf2ce430..3e6bcd7d5d8 100644
--- a/usr.sbin/smtpd/parse.y
+++ b/usr.sbin/smtpd/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.219 2018/09/01 21:20:32 gilles Exp $ */
+/* $OpenBSD: parse.y,v 1.220 2018/09/05 08:47:34 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -183,7 +183,7 @@ typedef struct {
%token KEY
%token LIMIT LISTEN LMTP LOCAL
%token MAIL_FROM MAILDIR MASK_SRC MASQUERADE MATCH MAX_MESSAGE_SIZE MAX_DEFERRED MBOX MDA MTA MX
-%token NODSN NOVERIFY
+%token NO_DSN NO_VERIFY
%token ON
%token PKI PORT
%token QUEUE
@@ -739,7 +739,7 @@ HELO STRING {
dispatcher->u.remote.smarthost = strdup(t->t_name);
}
-| TLS NOVERIFY {
+| TLS NO_VERIFY {
if (dispatcher->u.remote.smarthost == NULL) {
yyerror("tls no-verify may not be specified without host on a dispatcher");
YYERROR;
@@ -1402,7 +1402,7 @@ opt_if_listen : INET4 {
listen_opts.options |= LO_RECEIVEDAUTH;
listen_opts.flags |= F_RECEIVEDAUTH;
}
- | NODSN {
+ | NO_DSN {
if (listen_opts.options & LO_NODSN) {
yyerror("no-dsn already specified");
YYERROR;
@@ -1638,8 +1638,8 @@ lookup(char *s)
{ "mda", MDA },
{ "mta", MTA },
{ "mx", MX },
- { "no-dsn", NODSN },
- { "no-verify", NOVERIFY },
+ { "no-dsn", NO_DSN },
+ { "no-verify", NO_VERIFY },
{ "on", ON },
{ "pki", PKI },
{ "port", PORT },