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

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2023-12-15 04:25:16 +00:00
parent 8801582927
commit 30cf31d90d
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
55 changed files with 633 additions and 516 deletions
Download patch file Download diff file Expand all files Collapse all files

10
usr.sbin/rad/frontend.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: frontend.c,v 1.42 2022/12/28 21:30:18 jmc Exp $ */
/* $OpenBSD: frontend.c,v 1.43 2023/12/14 11:09:34 claudio Exp $ */
/*
* Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@ -339,7 +339,7 @@ frontend_dispatch_main(int fd, short event, void *bula)
if (iev_engine)
fatalx("%s: received unexpected imsg fd to "
"frontend", __func__);
if ((fd = imsg.fd) == -1)
if ((fd = imsg_get_fd(&imsg)) == -1)
fatalx("%s: expected to receive imsg fd to "
"frontend but didn't receive any",
__func__);
@ -465,7 +465,7 @@ frontend_dispatch_main(int fd, short event, void *bula)
nconf = NULL;
break;
case IMSG_ICMP6SOCK:
if ((icmp6sock = imsg.fd) == -1)
if ((icmp6sock = imsg_get_fd(&imsg)) == -1)
fatalx("%s: expected to receive imsg "
"ICMPv6 fd but didn't receive any",
__func__);
@ -479,7 +479,7 @@ frontend_dispatch_main(int fd, short event, void *bula)
if (routesock != -1)
fatalx("%s: received unexpected routesock fd",
__func__);
if ((routesock = imsg.fd) == -1)
if ((routesock = imsg_get_fd(&imsg)) == -1)
fatalx("%s: expected to receive imsg "
"routesocket fd but didn't receive any",
__func__);
@ -490,7 +490,7 @@ frontend_dispatch_main(int fd, short event, void *bula)
frontend_startup();
break;
case IMSG_CONTROLFD:
if ((fd = imsg.fd) == -1)
if ((fd = imsg_get_fd(&imsg)) == -1)
fatalx("%s: expected to receive imsg "
"control fd but didn't receive any",
__func__);