upstream: when redirecting sshd's log output to a file, undo this

redirection after the session child process is forked(); ok dtucker@

OpenBSD-Commit-ID: 6df86dd653c91f5bc8ac1916e7680d9d24690865

1 files changed, 4 insertions, 1 deletions

diff --git a/session.c b/session.c
index f6193b98e..a37eb4ae2 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.320 2020/06/26 04:45:11 dtucker Exp $ */
+/* $OpenBSD: session.c,v 1.321 2020/07/03 06:46:41 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1501,6 +1501,9 @@ child_close_fds(struct ssh *ssh)
          */
         endpwent();
 
+        /* Stop directing logs to a high-numbered fd before we close it */
+        log_redirect_stderr_to(NULL);
+
         /*
          * Close any extra open file descriptors so that we don't have them
          * hanging around in clients.  Note that we want to do this after