tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
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
This commit is contained in:
djm@openbsd.org 2017-06-24 05:24:11 +00:00 committed by Damien Miller
parent e238645d78
commit 8904ffce05
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
session.c
View File

@ -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 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -134,7 +134,6 @@ static int session_pty_req(Session *);
/* import */ /* import */
extern ServerOptions options; extern ServerOptions options;
extern char *__progname; extern char *__progname;
extern int log_stderr;
extern int debug_flag; extern int debug_flag;
extern u_int utmp_len; extern u_int utmp_len;
extern int startup_pipe; extern int startup_pipe;
@ -364,10 +363,6 @@ do_exec_no_pty(Session *s, const char *command)
case 0: case 0:
is_child = 1; 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 * Create a new session and process group since the 4.4BSD
* setlogin() affects the entire process group. * setlogin() affects the entire process group.
@ -522,9 +517,6 @@ do_exec_pty(Session *s, const char *command)
close(fdout); close(fdout);
close(ptymaster); 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 the master side of the pseudo tty. */
close(ptyfd); close(ptyfd);