summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@openbsd.org>2018-04-08 19:10:12 +0000
committerflorian <florian@openbsd.org>2018-04-08 19:10:12 +0000
commit179fe9a68a1b0527cd26a0a0a217a19dd45d27f6 (patch)
tree7f22368a60f76a0a786547a3bc095f1ce3018e45
parentAF_LOCAL was a failed attempt (by POSIX?) to seem less UNIX-specific, but (diff)
downloadwireguard-openbsd-179fe9a68a1b0527cd26a0a0a217a19dd45d27f6.tar.xz
wireguard-openbsd-179fe9a68a1b0527cd26a0a0a217a19dd45d27f6.zip
We warned long enough, also sysmerge(8) should have handled the
removal of the agreement url by now. OK benno
-rw-r--r--usr.sbin/acme-client/parse.y11
1 files changed, 3 insertions, 8 deletions
diff --git a/usr.sbin/acme-client/parse.y b/usr.sbin/acme-client/parse.y
index 7882c24527e..1630b85b5c4 100644
--- a/usr.sbin/acme-client/parse.y
+++ b/usr.sbin/acme-client/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.19 2017/11/27 01:58:52 florian Exp $ */
+/* $OpenBSD: parse.y,v 1.20 2018/04/08 19:10:12 florian Exp $ */
/*
* Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -92,7 +92,7 @@ typedef struct {
%}
-%token AUTHORITY AGREEMENT URL API ACCOUNT
+%token AUTHORITY URL API ACCOUNT
%token DOMAIN ALTERNATIVE NAMES CERT FULL CHAIN KEY SIGN WITH CHALLENGEDIR
%token YES NO
%token INCLUDE
@@ -188,11 +188,7 @@ authorityopts_l : authorityopts_l authorityoptsl nl
| authorityoptsl optnl
;
-authorityoptsl : AGREEMENT URL STRING {
- warnx("\"agreement url\" is deprecated.");
- /* XXX remove after 6.3 */
- }
- | API URL STRING {
+authorityoptsl : API URL STRING {
char *s;
if (auth->api != NULL) {
yyerror("duplicate api");
@@ -408,7 +404,6 @@ lookup(char *s)
/* this has to be sorted always */
static const struct keywords keywords[] = {
{"account", ACCOUNT},
- {"agreement", AGREEMENT},
{"alternative", ALTERNATIVE},
{"api", API},
{"authority", AUTHORITY},