diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-06-24 05:24:11 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-06-24 16:48:39 +1000 |
| commit | 8904ffce057b80a7472955f1ec00d7d5c250076c (patch) | |
| tree | 7ebc9f076806ac403175836dc243beab436d97ce /session.c | |
| parent | e238645d789cd7eb47541b66aea2a887ea122c9b (diff) | |
| download | openssh-git-8904ffce057b80a7472955f1ec00d7d5c250076c.tar.gz | |
upstream commit
no need to call log_init to reinitialise logged PID in
child sessions, since we haven't called openlog() in log_init() since 1999;
ok markus@
Upstream-ID: 0906e4002af5d83d3d544df75e1187c932a3cf2e
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.288 2017/05/31 09:15:42 deraadt Exp $ */ +/* $OpenBSD: session.c,v 1.289 2017/06/24 05:24:11 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -134,7 +134,6 @@ static int session_pty_req(Session *); /* import */ extern ServerOptions options; extern char *__progname; -extern int log_stderr; extern int debug_flag; extern u_int utmp_len; extern int startup_pipe; @@ -364,10 +363,6 @@ do_exec_no_pty(Session *s, const char *command) case 0: is_child = 1; - /* Child. Reinitialize the log since the pid has changed. */ - log_init(__progname, options.log_level, - options.log_facility, log_stderr); - /* * Create a new session and process group since the 4.4BSD * setlogin() affects the entire process group. @@ -522,9 +517,6 @@ do_exec_pty(Session *s, const char *command) close(fdout); close(ptymaster); - /* Child. Reinitialize the log because the pid has changed. */ - log_init(__progname, options.log_level, - options.log_facility, log_stderr); /* Close the master side of the pseudo tty. */ close(ptyfd); |