Re: acme-client: remove last remenants of agreement url from parse.y

[Sebastian Benoit]

reads ok

Florian Obser(flor...@openbsd.org) on 2018.04.08 20:59:40 +0200:
> I hear 6.3 has been released...
> 
> OK?
> 
> diff --git parse.y parse.y
> index 7882c24527e..6f4dbfe0c47 100644
> --- parse.y
> +++ parse.y
> @@ -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},
> 
> -- 
> I'm not entirely sure you are real.
> 

acme-client: remove last remenants of agreement url from parse.y

[Florian Obser]

I hear 6.3 has been released...

OK?

diff --git parse.y parse.y
index 7882c24527e..6f4dbfe0c47 100644
--- parse.y
+++ parse.y
@@ -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},

-- 
I'm not entirely sure you are real.