Re: relayd: remove deprecated log (updates|all) options
Thanks for noticing!
Klemens Nanni(k...@openbsd.org) on 2019.09.17 22:40:10 +0200:
> On Sun, Sep 01, 2019 at 04:27:25PM +0200, Sebastian Benoit wrote:
> > This was mentioned in the upgrade guide:
> > http://www.openbsd.org/faq/upgrade64.html
> Quote:
>
> Use of the old options will result in a warning message and
> they will be removed in OpenBSD 6.5.
>
> > Ok to remove the old options completly after 2 releases?
> You can remove the now unused tokens as well; feel free to commit the
> following diff with OK kn.
>
>
> Index: parse.y
> ===
> RCS file: /cvs/src/usr.sbin/relayd/parse.y,v
> retrieving revision 1.242
> diff -u -p -r1.242 parse.y
> --- parse.y 15 Sep 2019 19:23:29 - 1.242
> +++ parse.y 17 Sep 2019 20:38:40 -
> @@ -168,7 +168,7 @@ typedef struct {
>
> %}
>
> -%token ALL APPEND BACKLOG BACKUP BINARY BUFFER CA CACHE SET CHECK
> CIPHERS CODE
> +%token APPEND BACKLOG BACKUP BINARY BUFFER CA CACHE SET CHECK CIPHERS
> CODE
> %token COOKIE DEMOTE DIGEST DISABLE ERROR EXPECT PASS BLOCK EXTERNAL
> FILENAME
> %token FORWARD FROM HASH HEADER HEADERLEN HOST HTTP ICMP INCLUDE INET
> INET6
> %token INTERFACE INTERVAL IP KEYPAIR LABEL LISTEN VALUE LOADBALANCE
> LOG LOOKUP
> @@ -176,7 +176,7 @@ typedef struct {
> %token PREFORK PRIORITY PROTO QUERYSTR REAL REDIRECT RELAY REMOVE
> REQUEST
> %token RESPONSE RETRY QUICK RETURN ROUNDROBIN ROUTE SACK SCRIPT SEND
> SESSION
> %token SNMP SOCKET SPLICE SSL STICKYADDR STYLE TABLE TAG TAGGED TCP
> TIMEOUT TLS
> -%token TO ROUTER RTLABEL TRANSPARENT TRAP UPDATES URL WITH TTL RTABLE
> +%token TO ROUTER RTLABEL TRANSPARENT TRAP URL WITH TTL RTABLE
> %token MATCH PARAMS RANDOM LEASTSTATES SRCHASH KEY CERTIFICATE
> PASSWORD ECDHE
> %token EDH TICKETS CONNECTION CONNECTIONS ERRORS STATE CHANGES CHECKS
> %token WEBSOCKETS
> @@ -455,20 +455,8 @@ main : INTERVAL NUMBER {
> trap : /* nothing */ { $$ = 0; }
> | TRAP { $$ = 1; }
>
> -loglevel : UPDATES { /* remove 6.4-current */
> - $$ = RELAYD_OPT_LOGUPDATE;
> - log_warnx("log updates deprecated, "
> - "update configuration");
> - }
> - | STATE CHANGES { $$ = RELAYD_OPT_LOGUPDATE; }
> +loglevel : STATE CHANGES { $$ = RELAYD_OPT_LOGUPDATE; }
> | HOST CHECKS { $$ = RELAYD_OPT_LOGHOSTCHECK; }
> - | ALL { /* remove 6.4-current */
> - $$ = (RELAYD_OPT_LOGHOSTCHECK|
> - RELAYD_OPT_LOGCON|
> - RELAYD_OPT_LOGCONERR);
> - log_warnx("log all deprecated, "
> - "update configuration");
> - }
> | CONNECTION{ $$ = (RELAYD_OPT_LOGCON |
> RELAYD_OPT_LOGCONERR); }
> | CONNECTION ERRORS { $$ = RELAYD_OPT_LOGCONERR; }
> @@ -2354,7 +2342,6 @@ lookup(char *s)
> {
> /* this has to be sorted always */
> static const struct keywords keywords[] = {
> - { "all",ALL },
> { "append", APPEND },
> { "backlog",BACKLOG },
> { "backup", BACKUP },
> @@ -2462,7 +2449,6 @@ lookup(char *s)
> { "transparent",TRANSPARENT },
> { "trap", TRAP },
> { "ttl",TTL },
> - { "updates",UPDATES },
> { "url",URL },
> { "value", VALUE },
> { "websockets", WEBSOCKETS },
>
Re: relayd: remove deprecated log (updates|all) options
On Sun, Sep 01, 2019 at 04:27:25PM +0200, Sebastian Benoit wrote:
> This was mentioned in the upgrade guide:
> http://www.openbsd.org/faq/upgrade64.html
Quote:
Use of the old options will result in a warning message and
they will be removed in OpenBSD 6.5.
> Ok to remove the old options completly after 2 releases?
You can remove the now unused tokens as well; feel free to commit the
following diff with OK kn.
Index: parse.y
===
RCS file: /cvs/src/usr.sbin/relayd/parse.y,v
retrieving revision 1.242
diff -u -p -r1.242 parse.y
--- parse.y 15 Sep 2019 19:23:29 - 1.242
+++ parse.y 17 Sep 2019 20:38:40 -
@@ -168,7 +168,7 @@ typedef struct {
%}
-%token ALL APPEND BACKLOG BACKUP BINARY BUFFER CA CACHE SET CHECK CIPHERS CODE
+%token APPEND BACKLOG BACKUP BINARY BUFFER CA CACHE SET CHECK CIPHERS CODE
%token COOKIE DEMOTE DIGEST DISABLE ERROR EXPECT PASS BLOCK EXTERNAL FILENAME
%token FORWARD FROM HASH HEADER HEADERLEN HOST HTTP ICMP INCLUDE INET INET6
%token INTERFACE INTERVAL IP KEYPAIR LABEL LISTEN VALUE LOADBALANCE LOG LOOKUP
@@ -176,7 +176,7 @@ typedef struct {
%token PREFORK PRIORITY PROTO QUERYSTR REAL REDIRECT RELAY REMOVE REQUEST
%token RESPONSE RETRY QUICK RETURN ROUNDROBIN ROUTE SACK SCRIPT SEND SESSION
%token SNMP SOCKET SPLICE SSL STICKYADDR STYLE TABLE TAG TAGGED TCP TIMEOUT TLS
-%token TO ROUTER RTLABEL TRANSPARENT TRAP UPDATES URL WITH TTL RTABLE
+%token TO ROUTER RTLABEL TRANSPARENT TRAP URL WITH TTL RTABLE
%token MATCH PARAMS RANDOM LEASTSTATES SRCHASH KEY CERTIFICATE PASSWORD ECDHE
%token EDH TICKETS CONNECTION CONNECTIONS ERRORS STATE CHANGES CHECKS
%token WEBSOCKETS
@@ -455,20 +455,8 @@ main : INTERVAL NUMBER {
trap : /* nothing */ { $$ = 0; }
| TRAP { $$ = 1; }
-loglevel : UPDATES { /* remove 6.4-current */
- $$ = RELAYD_OPT_LOGUPDATE;
- log_warnx("log updates deprecated, "
- "update configuration");
- }
- | STATE CHANGES { $$ = RELAYD_OPT_LOGUPDATE; }
+loglevel : STATE CHANGES { $$ = RELAYD_OPT_LOGUPDATE; }
| HOST CHECKS { $$ = RELAYD_OPT_LOGHOSTCHECK; }
- | ALL { /* remove 6.4-current */
- $$ = (RELAYD_OPT_LOGHOSTCHECK|
- RELAYD_OPT_LOGCON|
- RELAYD_OPT_LOGCONERR);
- log_warnx("log all deprecated, "
- "update configuration");
- }
| CONNECTION{ $$ = (RELAYD_OPT_LOGCON |
RELAYD_OPT_LOGCONERR); }
| CONNECTION ERRORS { $$ = RELAYD_OPT_LOGCONERR; }
@@ -2354,7 +2342,6 @@ lookup(char *s)
{
/* this has to be sorted always */
static const struct keywords keywords[] = {
- { "all",ALL },
{ "append", APPEND },
{ "backlog",BACKLOG },
{ "backup", BACKUP },
@@ -2462,7 +2449,6 @@ lookup(char *s)
{ "transparent",TRANSPARENT },
{ "trap", TRAP },
{ "ttl",TTL },
- { "updates",UPDATES },
{ "url",URL },
{ "value", VALUE },
{ "websockets", WEBSOCKETS },
Re: relayd: remove deprecated log (updates|all) options
ping
Sebastian Benoit(be...@openbsd.org) on 2019.09.01 16:27:25 +0200:
>
> Hi,
>
> in OpenBSD 6.4 and 6.5, the log options
>
> log updates
> log all
>
> are deprecated, they still work and show a warning.
>
> This was mentioned in the upgrade guide:
> http://www.openbsd.org/faq/upgrade64.html
>
> Ok to remove the old options completly after 2 releases?
>
> /B
>
> diff --git usr.sbin/relayd/parse.y usr.sbin/relayd/parse.y
> index c6e2bcacdfb..4cc44080504 100644
> --- usr.sbin/relayd/parse.y
> +++ usr.sbin/relayd/parse.y
> @@ -436,20 +436,8 @@ main : INTERVAL NUMBER {
> trap : /* nothing */ { $$ = 0; }
> | TRAP { $$ = 1; }
>
> -loglevel : UPDATES { /* remove 6.4-current */
> - $$ = RELAYD_OPT_LOGUPDATE;
> - log_warnx("log updates deprecated, "
> - "update configuration");
> - }
> - | STATE CHANGES { $$ = RELAYD_OPT_LOGUPDATE; }
> +loglevel : STATE CHANGES { $$ = RELAYD_OPT_LOGUPDATE; }
> | HOST CHECKS { $$ = RELAYD_OPT_LOGHOSTCHECK; }
> - | ALL { /* remove 6.4-current */
> - $$ = (RELAYD_OPT_LOGHOSTCHECK|
> - RELAYD_OPT_LOGCON|
> - RELAYD_OPT_LOGCONERR);
> - log_warnx("log all deprecated, "
> - "update configuration");
> - }
> | CONNECTION{ $$ = (RELAYD_OPT_LOGCON |
> RELAYD_OPT_LOGCONERR); }
> | CONNECTION ERRORS { $$ = RELAYD_OPT_LOGCONERR; }
>
relayd: remove deprecated log (updates|all) options
Hi,
in OpenBSD 6.4 and 6.5, the log options
log updates
log all
are deprecated, they still work and show a warning.
This was mentioned in the upgrade guide:
http://www.openbsd.org/faq/upgrade64.html
Ok to remove the old options completly after 2 releases?
/B
diff --git usr.sbin/relayd/parse.y usr.sbin/relayd/parse.y
index c6e2bcacdfb..4cc44080504 100644
--- usr.sbin/relayd/parse.y
+++ usr.sbin/relayd/parse.y
@@ -436,20 +436,8 @@ main : INTERVAL NUMBER {
trap : /* nothing */ { $$ = 0; }
| TRAP { $$ = 1; }
-loglevel : UPDATES { /* remove 6.4-current */
- $$ = RELAYD_OPT_LOGUPDATE;
- log_warnx("log updates deprecated, "
- "update configuration");
- }
- | STATE CHANGES { $$ = RELAYD_OPT_LOGUPDATE; }
+loglevel : STATE CHANGES { $$ = RELAYD_OPT_LOGUPDATE; }
| HOST CHECKS { $$ = RELAYD_OPT_LOGHOSTCHECK; }
- | ALL { /* remove 6.4-current */
- $$ = (RELAYD_OPT_LOGHOSTCHECK|
- RELAYD_OPT_LOGCON|
- RELAYD_OPT_LOGCONERR);
- log_warnx("log all deprecated, "
- "update configuration");
- }
| CONNECTION{ $$ = (RELAYD_OPT_LOGCON |
RELAYD_OPT_LOGCONERR); }
| CONNECTION ERRORS { $$ = RELAYD_OPT_LOGCONERR; }
