Many of our networking daemons use proc.c to set up processes and ipc. I
couldn't
find two that are actually exactly the same, but it looks like none of them are
ever
using proc_ispeer, so here is a diff to delete it from all of them.
Index: sbin/iked/proc.c
===================================================================
RCS file: /cvs/src/sbin/iked/proc.c,v
retrieving revision 1.35
diff -u -p -r1.35 proc.c
--- sbin/iked/proc.c 20 Apr 2021 21:11:56 -0000 1.35
+++ sbin/iked/proc.c 15 Feb 2023 10:56:52 -0000
@@ -39,23 +39,10 @@ enum privsep_procid privsep_process;
void proc_open(struct privsep *, struct privsep_proc *,
struct privsep_proc *, size_t);
void proc_close(struct privsep *);
-int proc_ispeer(struct privsep_proc *, unsigned int, enum privsep_procid);
void proc_shutdown(struct privsep_proc *);
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 *);
-
-int
-proc_ispeer(struct privsep_proc *procs, unsigned int nproc,
- enum privsep_procid type)
-{
- unsigned int i;
-
- for (i = 0; i < nproc; i++)
- if (procs[i].p_id == type)
- return (1);
- return (0);
-}
void
proc_init(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc)
Index: usr.sbin/httpd/proc.c
===================================================================
RCS file: /cvs/src/usr.sbin/httpd/proc.c,v
retrieving revision 1.41
diff -u -p -r1.41 proc.c
--- usr.sbin/httpd/proc.c 4 Dec 2021 06:52:58 -0000 1.41
+++ usr.sbin/httpd/proc.c 15 Feb 2023 10:56:52 -0000
@@ -43,23 +43,10 @@ void proc_open(struct privsep *, int, i
void proc_accept(struct privsep *, int, enum privsep_procid,
unsigned int);
void proc_close(struct privsep *);
-int proc_ispeer(struct privsep_proc *, unsigned int, enum privsep_procid);
void proc_shutdown(struct privsep_proc *);
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 *);
-
-int
-proc_ispeer(struct privsep_proc *procs, unsigned int nproc,
- enum privsep_procid type)
-{
- unsigned int i;
-
- for (i = 0; i < nproc; i++)
- if (procs[i].p_id == type)
- return (1);
- return (0);
-}
enum privsep_procid
proc_getid(struct privsep_proc *procs, unsigned int nproc,
Index: usr.sbin/relayd/proc.c
===================================================================
RCS file: /cvs/src/usr.sbin/relayd/proc.c,v
retrieving revision 1.43
diff -u -p -r1.43 proc.c
--- usr.sbin/relayd/proc.c 3 Sep 2022 20:07:31 -0000 1.43
+++ usr.sbin/relayd/proc.c 15 Feb 2023 10:56:52 -0000
@@ -43,23 +43,10 @@ void proc_open(struct privsep *, int, i
void proc_accept(struct privsep *, int, enum privsep_procid,
unsigned int);
void proc_close(struct privsep *);
-int proc_ispeer(struct privsep_proc *, unsigned int, enum privsep_procid);
void proc_shutdown(struct privsep_proc *);
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 *);
-
-int
-proc_ispeer(struct privsep_proc *procs, unsigned int nproc,
- enum privsep_procid type)
-{
- unsigned int i;
-
- for (i = 0; i < nproc; i++)
- if (procs[i].p_id == type)
- return (1);
- return (0);
-}
enum privsep_procid
proc_getid(struct privsep_proc *procs, unsigned int nproc,
Index: usr.sbin/snmpd/proc.c
===================================================================
RCS file: /cvs/src/usr.sbin/snmpd/proc.c,v
retrieving revision 1.27
diff -u -p -r1.27 proc.c
--- usr.sbin/snmpd/proc.c 30 Jun 2020 17:11:49 -0000 1.27
+++ usr.sbin/snmpd/proc.c 15 Feb 2023 10:56:52 -0000
@@ -43,23 +43,10 @@ void proc_open(struct privsep *, int, i
void proc_accept(struct privsep *, int, enum privsep_procid,
unsigned int);
void proc_close(struct privsep *);
-int proc_ispeer(struct privsep_proc *, unsigned int, enum privsep_procid);
void proc_shutdown(struct privsep_proc *);
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 *);
-
-int
-proc_ispeer(struct privsep_proc *procs, unsigned int nproc,
- enum privsep_procid type)
-{
- unsigned int i;
-
- for (i = 0; i < nproc; i++)
- if (procs[i].p_id == type)
- return (1);
- return (0);
-}
enum privsep_procid
proc_getid(struct privsep_proc *procs, unsigned int nproc,
Index: usr.sbin/vmd/proc.c
===================================================================
RCS file: /cvs/src/usr.sbin/vmd/proc.c,v
retrieving revision 1.19
diff -u -p -r1.19 proc.c
--- usr.sbin/vmd/proc.c 20 Apr 2021 21:11:56 -0000 1.19
+++ usr.sbin/vmd/proc.c 15 Feb 2023 10:56:52 -0000
@@ -43,23 +43,10 @@ void proc_open(struct privsep *, int, i
void proc_accept(struct privsep *, int, enum privsep_procid,
unsigned int);
void proc_close(struct privsep *);
-int proc_ispeer(struct privsep_proc *, unsigned int, enum privsep_procid);
void proc_shutdown(struct privsep_proc *);
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 *);
-
-int
-proc_ispeer(struct privsep_proc *procs, unsigned int nproc,
- enum privsep_procid type)
-{
- unsigned int i;
-
- for (i = 0; i < nproc; i++)
- if (procs[i].p_id == type)
- return (1);
- return (0);
-}
enum privsep_procid
proc_getid(struct privsep_proc *procs, unsigned int nproc,
