diff options
author | Thomas Adam <thomas@xteddy.org> | 2017-03-09 18:01:16 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2017-03-09 18:01:16 +0000 |
commit | c5bdae466e4dad6c185fa5146b11275b6119ff24 (patch) | |
tree | 05536631ebb8c314a3026748c2b20753594cc5af /job.c | |
parent | fd96ccfd802aec27a4835f7bb2030003b9668e64 (diff) | |
parent | bce1dee0341b3624d927d393fd0f21771660d5ed (diff) |
Merge branch 'obsd-master'
Diffstat (limited to 'job.c')
-rw-r--r-- | job.c | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -52,12 +52,7 @@ job_run(const char *cmd, struct session *s, const char *cwd, if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, out) != 0) return (NULL); - env = environ_create(); - environ_copy(global_environ, env); - if (s != NULL) - environ_copy(s->environ, env); - server_fill_environ(s, env); - + env = environ_for_session(s); switch (pid = fork()) { case -1: environ_free(env); |