diff options
author | dtucker <dtucker> | 2013-06-05 22:21:14 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2013-06-05 22:21:14 +0000 |
commit | 9e79cbe4e73b63b54ea6c562dd7fbdb258fa377c (patch) | |
tree | ebac647041b4084504588efe2719ffc3ce9478b1 | |
parent | 72b5f7d8f51efb1a68f4d54fa75cab08252f4bed (diff) | |
download | openssh-9e79cbe4e73b63b54ea6c562dd7fbdb258fa377c.tar.gz |
- dtucker@cvs.openbsd.org 2013/06/05 02:27:50
[sshd.c]
When running sshd -D, close stderr unless we have explicitly requesting
logging to stderr. From james.hunt at ubuntu.com via bz#1976, djm's patch
so, err, ok dtucker.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.c | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -35,6 +35,11 @@ [mux.c] fix leaks in mux error paths, from Zhenbo Xu, found by Melton. bz#1967, ok djm + - dtucker@cvs.openbsd.org 2013/06/05 02:27:50 + [sshd.c] + When running sshd -D, close stderr unless we have explicitly requesting + logging to stderr. From james.hunt at ubuntu.com via bz#1976, djm's patch + so, err, ok dtucker. 20130602 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.402 2013/05/17 00:13:14 djm Exp $ */ +/* $OpenBSD: sshd.c,v 1.403 2013/06/05 02:27:50 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1024,7 +1024,9 @@ server_accept_inetd(int *sock_in, int *sock_out) if ((fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) { dup2(fd, STDIN_FILENO); dup2(fd, STDOUT_FILENO); - if (fd > STDOUT_FILENO) + if (!log_stderr) + dup2(fd, STDERR_FILENO); + if (fd > (log_stderr ? STDERR_FILENO : STDOUT_FILENO)) close(fd); } debug("inetd sockets after dupping: %d, %d", *sock_in, *sock_out); |