Move server_fill_environ into environ.c and move some other common code

into it.

1 files changed, 1 insertions, 6 deletions

diff --git a/job.c b/job.c
index 8310c376..d5b8713f 100644
--- a/job.c
+++ b/job.c
@@ -53,12 +53,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);