diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2018-04-08 19:10:13 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2018-04-08 19:10:13 +0000 |
| commit | fcec641ff2200389a9fc6c27bdea89ca257b8efe (patch) | |
| tree | 63e8a62b12c2447f453a44c8bd311b2ce825424b /usr.sbin | |
| parent | 10d1e2577c69918a757c7539906cd3265869e1fd (diff) | |
We warned long enough, also sysmerge(8) should have handled the
removal of the agreement url by now.
OK benno
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/acme-client/parse.y | 11 |
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}, |