SecBSD/src
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with OpenBSD -current

Browse Source
This commit is contained in:
purplerain 2024-02-20 03:58:59 +00:00
parent 3a0fe9932a
commit 3e9a3eed62
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/ic/bwfm.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bwfm.c,v 1.110 2023/10/09 21:49:34 kettenis Exp $ */ /* $OpenBSD: bwfm.c,v 1.111 2024/02/19 21:23:02 stsp Exp $ */
/* /*
* Copyright (c) 2010-2016 Broadcom Corporation * Copyright (c) 2010-2016 Broadcom Corporation
* Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se> * Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se>
@ -451,6 +451,16 @@ bwfm_init(struct ifnet *ifp)
return; return;
} }
sc->sc_initialized = 1; sc->sc_initialized = 1;
} else {
/* Update MAC in case the upper layers changed it. */
IEEE80211_ADDR_COPY(ic->ic_myaddr,
((struct arpcom *)ifp)->ac_enaddr);
if (bwfm_fwvar_var_set_data(sc, "cur_etheraddr",
ic->ic_myaddr, sizeof(ic->ic_myaddr))) {
printf("%s: could not write MAC address\n",
DEVNAME(sc));
return;
}
} }
/* Select default channel */ /* Select default channel */

14
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> * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@ -778,7 +778,7 @@ HELO STRING {
YYERROR; 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", yyerror("table \"%s\" may not be used for source lookups",
t->t_name); t->t_name);
YYERROR; YYERROR;
@ -1102,7 +1102,7 @@ negation TAG REGEX tables {
YYERROR; 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", yyerror("table \"%s\" may not be used for auth lookups",
t->t_name); t->t_name);
YYERROR; YYERROR;
@ -1137,7 +1137,7 @@ negation TAG REGEX tables {
YYERROR; 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", yyerror("table \"%s\" may not be used for mail-from lookups",
t->t_name); t->t_name);
YYERROR; YYERROR;
@ -1172,7 +1172,7 @@ negation TAG REGEX tables {
YYERROR; 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", yyerror("table \"%s\" may not be used for rcpt-to lookups",
t->t_name); t->t_name);
YYERROR; YYERROR;
@ -1372,7 +1372,7 @@ negation TAG REGEX tables {
YYERROR; 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", yyerror("table \"%s\" may not be used for from lookups",
t->t_name); t->t_name);
YYERROR; YYERROR;
@ -1469,7 +1469,7 @@ negation TAG REGEX tables {
YYERROR; 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", yyerror("table \"%s\" may not be used for for lookups",
t->t_name); t->t_name);
YYERROR; YYERROR;