commit ef3dc4ff7ec2baebbb88f95b42d54f0899055be6 from: Tracey Emery date: Fri Jan 29 14:53:29 2021 UTC fix for -fno-common commit - b4a50969aae71604f0b273ee30112bfeafe407e5 commit + ef3dc4ff7ec2baebbb88f95b42d54f0899055be6 blob - 13a0d75dae084822bbb8fd4568a780752d16ad3f blob + 13a00af9490060efbaae2c1bf92db95c8efeac3a --- thingsd/Makefile +++ thingsd/Makefile @@ -11,7 +11,7 @@ MANDIR?= ${PREFIX}/man/man CFLAGS += -Wall -I${.CURDIR} CFLAGS += -Wstrict-prototypes -Wmissing-prototypes CFLAGS += -Wmissing-declarations -CFLAGS += -Wshadow -Wpointer-arith +CFLAGS += -Wshadow -Wpointer-arith -fno-common CFLAGS += -Wsign-compare -pthread YFLAGS = LDADD = -levent -ltls -lssl -lcrypto -lutil -pthread blob - 28b7bbb98735131a022c655a7a274115314a240f blob + 00671e197709093d56ca09d3a767a9ac91ca0a18 --- thingsd/config.c +++ thingsd/config.c @@ -40,6 +40,8 @@ #include "proc.h" #include "thingsd.h" +extern enum privsep_procid privsep_process; + int config_init(struct thingsd *env) { blob - 7198fd4583a422df5879316f7ed86a8f4f315d0f blob + 420eae4cbb3c6c0b080fb05f67626d7caa4cdfd4 --- thingsd/proc.c +++ thingsd/proc.c @@ -46,6 +46,8 @@ void proc_sig_handler(int, short, void *); void proc_range(struct privsep *, enum privsep_procid, int *, int *); int proc_dispatch_null(int, struct privsep_proc *, struct imsg *); +enum privsep_procid privsep_process; + int proc_ispeer(struct privsep_proc *procs, unsigned int nproc, enum privsep_procid type) blob - 07d7c1ce586a14ed9fcca6d2471daea1d64f9f4f blob + 7984e6289b162d786b5ed60c0dcc9d601dfe670a --- thingsd/proc.h +++ thingsd/proc.h @@ -54,10 +54,10 @@ struct control_sock { }; TAILQ_HEAD(control_socks, control_sock); -struct { +struct cs { struct event ev; int fd; -} control_state; +}; struct ctl_conn { TAILQ_ENTRY(ctl_conn) entry; @@ -72,17 +72,17 @@ TAILQ_HEAD(ctl_connlist, ctl_conn); extern struct ctl_connlist ctl_conns; /* privsep */ +#define CONFIG_RELOAD 0x00 +#define CONFIG_THINGS 0x01 +#define CONFIG_ALL 0xff + enum privsep_procid { PROC_PARENT = 0, PROC_CONTROL, PROC_THINGS, PROC_MAX, -} privsep_process; +}; -#define CONFIG_RELOAD 0x00 -#define CONFIG_THINGS 0x01 -#define CONFIG_ALL 0xff - struct privsep_pipes { int *pp_pipes[PROC_MAX]; }; blob - ebcf62cc1f2f9008f824ac295a61fdb1d6999112 blob + d4fa01a8b54fbb62f5986f5905c2bb05d4de31bc --- thingsd/thingsd.c +++ thingsd/thingsd.c @@ -69,6 +69,8 @@ static struct privsep_proc procs[] = { static struct privsep_proc *proc_priv = &procs[0]; static struct passwd proc_privpw; +extern enum privsep_procid privsep_process; + int thingsd_dispatch_control(int fd, struct privsep_proc *p, struct imsg *imsg) {