diff options
| author |   djm <djm@openbsd.org> | 2017-06-24 05:24:11 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-06-24 05:24:11 +0000 |
| commit | 8e919b97e37da1d9b2bca4ff82c83671e31fe6fd (patch) | |
| tree | 5412cbe7e258ef0fe07d17a99672fa7fe310c56b | |
| parent | Consistently treat character escape sequences as operators, (diff) | |
| download | wireguard-openbsd-8e919b97e37da1d9b2bca4ff82c83671e31fe6fd.tar.xz wireguard-openbsd-8e919b97e37da1d9b2bca4ff82c83671e31fe6fd.zip | |
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@
| -rw-r--r-- | usr.bin/ssh/session.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c index b924901d76a..32046efdb6a 100644 --- a/usr.bin/ssh/session.c +++ b/usr.bin/ssh/session.c @@ -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 @@ -118,7 +118,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; @@ -345,10 +344,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. @@ -484,9 +479,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); |