diff options
| author | Rafael Zalamena <rzalamena@cvs.openbsd.org> | 2016-08-30 14:31:54 +0000 |
|---|---|---|
| committer | Rafael Zalamena <rzalamena@cvs.openbsd.org> | 2016-08-30 14:31:54 +0000 |
| commit | 9bdfcf2568e1fed0ab586f2f396c75071625d21f (patch) | |
| tree | 61cb2cf0003af826161e27f3794e86c8745b0a09 /usr.sbin/httpd/httpd.h | |
| parent | 3a3d9b1227aa9e75eb48ede2aa73cc97bebf703a (diff) | |
Kill (remove) the ps_pid from privsep struct since it is not being used
anymore. Also fix the process initialization prototypes.
ok reyk@
Diffstat (limited to 'usr.sbin/httpd/httpd.h')
| -rw-r--r-- | usr.sbin/httpd/httpd.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/httpd/httpd.h b/usr.sbin/httpd/httpd.h index cd172c67065..9e12cde6c7a 100644 --- a/usr.sbin/httpd/httpd.h +++ b/usr.sbin/httpd/httpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: httpd.h,v 1.113 2016/08/30 13:37:10 rzalamena Exp $ */ +/* $OpenBSD: httpd.h,v 1.114 2016/08/30 14:31:53 rzalamena Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -236,7 +236,6 @@ struct privsep { struct imsgev *ps_ievs[PROC_MAX]; const char *ps_title[PROC_MAX]; - pid_t ps_pid[PROC_MAX]; uint8_t ps_what[PROC_MAX]; unsigned int ps_instances[PROC_MAX]; @@ -263,7 +262,7 @@ struct privsep_proc { enum privsep_procid p_id; int (*p_cb)(int, struct privsep_proc *, struct imsg *); - pid_t (*p_init)(struct privsep *, + void (*p_init)(struct privsep *, struct privsep_proc *); void (*p_shutdown)(void); const char *p_chroot; @@ -529,7 +528,7 @@ int load_config(const char *, struct httpd *); int cmdline_symset(char *); /* server.c */ -pid_t server(struct privsep *, struct privsep_proc *); +void server(struct privsep *, struct privsep_proc *); int server_tls_cmp(struct server *, struct server *, int); int server_tls_load_keypair(struct server *); int server_privinit(struct server *); @@ -732,7 +731,7 @@ int config_setauth(struct httpd *, struct auth *); int config_getauth(struct httpd *, struct imsg *); /* logger.c */ -pid_t logger(struct privsep *, struct privsep_proc *); +void logger(struct privsep *, struct privsep_proc *); int logger_open_priv(struct imsg *); #endif /* _HTTPD_H */ |