proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 14:17:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ldpd: fix startup on OpenBSD

Browse Source 
We must open the PF_KEY socket before dropping privileges, otherwise the
socket creation will fail with permission problems.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2018-12-21 20:59:18 -02:00
parent 7f7651eba7
commit f43be00b6a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ldpd/ldpe.c
View File

@ -139,6 +139,16 @@ ldpe(void)
void void
ldpe_init(struct ldpd_init *init) ldpe_init(struct ldpd_init *init)
{ {
#ifdef __OpenBSD__
/* This socket must be open before dropping privileges. */
global.pfkeysock = pfkey_init();
if (sysdep.no_pfkey == 0) {
pfkey_ev = NULL;
thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock,
&pfkey_ev);
}
#endif
/* drop privileges */ /* drop privileges */
ldpe_privs.user = init->user; ldpe_privs.user = init->user;
ldpe_privs.group = init->group; ldpe_privs.group = init->group;
@ -159,14 +169,6 @@ ldpe_init(struct ldpd_init *init)
fatal("inet_pton"); fatal("inet_pton");
if (inet_pton(AF_INET6, AllRouters_v6, &global.mcast_addr_v6) != 1) if (inet_pton(AF_INET6, AllRouters_v6, &global.mcast_addr_v6) != 1)
fatal("inet_pton"); fatal("inet_pton");
#ifdef __OpenBSD__
global.pfkeysock = pfkey_init();
if (sysdep.no_pfkey == 0) {
pfkey_ev = NULL;
thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock,
&pfkey_ev);
}
#endif
/* mark sockets as closed */ /* mark sockets as closed */
global.ipv4.ldp_disc_socket = -1; global.ipv4.ldp_disc_socket = -1;