Skip to content

Commit

Permalink
no need to be as strict with table formats on various match constraints,
Browse files Browse the repository at this point in the history 
this prevents the reuse of T_HASH tables in T_LIST contexts when the key
column actually makes sense by itself.

diff from Philipp (philipp+openbsd [at] bureaucracy [dot] de)
  • Loading branch information
@poolpOrg
poolpOrg committed Feb 19, 2024
1 parent 0e1879a commit d813172
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions usr.sbin/smtpd/parse.y
View file
@@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.298 2024/02/03 15:50:00 op Exp $ */
/* $OpenBSD: parse.y,v 1.299 2024/02/19 21:00:19 gilles Exp $ */

/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
Expand Down Expand Up @@ -778,7 +778,7 @@ HELO STRING {
YYERROR;
}

if (!table_check_use(t, T_DYNAMIC|T_LIST, K_SOURCE)) {
if (!table_check_use(t, T_DYNAMIC|T_LIST|T_HASH, K_SOURCE)) {
yyerror("table \"%s\" may not be used for source lookups",
t->t_name);
YYERROR;
Expand Down Expand Up @@ -1102,7 +1102,7 @@ negation TAG REGEX tables {
YYERROR;
}

if (!table_check_use(t, T_DYNAMIC|T_LIST, K_STRING|K_CREDENTIALS)) {
if (!table_check_use(t, T_DYNAMIC|T_LIST|T_HASH, K_STRING|K_CREDENTIALS)) {
yyerror("table \"%s\" may not be used for auth lookups",
t->t_name);
YYERROR;
Expand Down Expand Up @@ -1137,7 +1137,7 @@ negation TAG REGEX tables {
YYERROR;
}

if (!table_check_use(t, T_DYNAMIC|T_LIST, K_MAILADDR)) {
if (!table_check_use(t, T_DYNAMIC|T_LIST|T_HASH, K_MAILADDR)) {
yyerror("table \"%s\" may not be used for mail-from lookups",
t->t_name);
YYERROR;
Expand Down Expand Up @@ -1172,7 +1172,7 @@ negation TAG REGEX tables {
YYERROR;
}

if (!table_check_use(t, T_DYNAMIC|T_LIST, K_MAILADDR)) {
if (!table_check_use(t, T_DYNAMIC|T_LIST|T_HASH, K_MAILADDR)) {
yyerror("table \"%s\" may not be used for rcpt-to lookups",
t->t_name);
YYERROR;
Expand Down Expand Up @@ -1330,7 +1330,7 @@ negation TAG REGEX tables {
YYERROR;
}

if (!table_check_use(t, T_DYNAMIC|T_LIST, K_STRING|K_CREDENTIALS)) {
if (!table_check_use(t, T_DYNAMIC|T_LIST, K_STRING|K_CREDENTIALS)) {
yyerror("table \"%s\" may not be used for from lookups",
t->t_name);
YYERROR;
Expand Down Expand Up @@ -1372,7 +1372,7 @@ negation TAG REGEX tables {
YYERROR;
}

if (!table_check_use(t, T_DYNAMIC|T_LIST, K_MAILADDR)) {
if (!table_check_use(t, T_DYNAMIC|T_LIST|T_HASH, K_MAILADDR)) {
yyerror("table \"%s\" may not be used for from lookups",
t->t_name);
YYERROR;
Expand Down Expand Up @@ -1469,7 +1469,7 @@ negation TAG REGEX tables {
YYERROR;
}

if (!table_check_use(t, T_DYNAMIC|T_LIST, K_MAILADDR)) {
if (!table_check_use(t, T_DYNAMIC|T_LIST|T_HASH, K_MAILADDR)) {
yyerror("table \"%s\" may not be used for for lookups",
t->t_name);
YYERROR;
Expand Down

0 comments on commit d813172

Please sign in to comment.