summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--session.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/session.c b/session.c
index 4ef48ecd6..295204c6e 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.288 2017/05/31 09:15:42 deraadt Exp $ */ 1/* $OpenBSD: session.c,v 1.289 2017/06/24 05:24:11 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -134,7 +134,6 @@ static int session_pty_req(Session *);
134/* import */ 134/* import */
135extern ServerOptions options; 135extern ServerOptions options;
136extern char *__progname; 136extern char *__progname;
137extern int log_stderr;
138extern int debug_flag; 137extern int debug_flag;
139extern u_int utmp_len; 138extern u_int utmp_len;
140extern int startup_pipe; 139extern int startup_pipe;
@@ -364,10 +363,6 @@ do_exec_no_pty(Session *s, const char *command)
364 case 0: 363 case 0:
365 is_child = 1; 364 is_child = 1;
366 365
367 /* Child. Reinitialize the log since the pid has changed. */
368 log_init(__progname, options.log_level,
369 options.log_facility, log_stderr);
370
371 /* 366 /*
372 * Create a new session and process group since the 4.4BSD 367 * Create a new session and process group since the 4.4BSD
373 * setlogin() affects the entire process group. 368 * setlogin() affects the entire process group.
@@ -522,9 +517,6 @@ do_exec_pty(Session *s, const char *command)
522 close(fdout); 517 close(fdout);
523 close(ptymaster); 518 close(ptymaster);
524 519
525 /* Child. Reinitialize the log because the pid has changed. */
526 log_init(__progname, options.log_level,
527 options.log_facility, log_stderr);
528 /* Close the master side of the pseudo tty. */ 520 /* Close the master side of the pseudo tty. */
529 close(ptyfd); 521 close(ptyfd);
530 522