diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-09-28 12:16:45 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-09-28 12:16:45 +0000 |
| commit | a05529c817ee15dffbd8b8dffd9ed3fdf46a18d8 (patch) | |
| tree | a3bd48a09d94845449d85d1c2b41e4298d59811d /usr.sbin/relayd/proc.c | |
| parent | 1a4de6a067d5b40e7b5b3d070ffb4043a696380c (diff) | |
sync proc.c incl. the p_env removal
Diffstat (limited to 'usr.sbin/relayd/proc.c')
| -rw-r--r-- | usr.sbin/relayd/proc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/relayd/proc.c b/usr.sbin/relayd/proc.c index 08dcafa3f1b..56b17277a81 100644 --- a/usr.sbin/relayd/proc.c +++ b/usr.sbin/relayd/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.32 2016/09/03 14:44:21 reyk Exp $ */ +/* $OpenBSD: proc.c,v 1.33 2016/09/28 12:16:44 reyk Exp $ */ /* * Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -115,7 +115,7 @@ proc_exec(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc, p = &procs[proc]; /* Update args with process title. */ - nargv[proc_i] = (char *) p->p_title; + nargv[proc_i] = (char *)(uintptr_t)p->p_title; /* Fire children processes. */ for (i = 0; i < ps->ps_instances[p->p_id]; i++) { @@ -300,7 +300,6 @@ proc_setup(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc) for (src = 0; src < nproc; src++) { procs[src].p_ps = ps; - procs[src].p_env = ps->ps_env; if (procs[src].p_cb == NULL) procs[src].p_cb = proc_dispatch_null; |