summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlebel <lebel@cvs.openbsd.org>2001-04-11 16:25:32 +0000
committerlebel <lebel@cvs.openbsd.org>2001-04-11 16:25:32 +0000
commite03d53b22be61588c975f8a774953a5fd187cf4d (patch)
tree1c99410277417f61455ff9ce8e8428018e412270
parent0107c4a5cf7d508671e7cdfaa03d198614e36a15 (diff)
implement the -e option into sshd:
-e When this option is specified, sshd will send the output to the standard error instead of the system log. markus@ OK.
-rw-r--r--usr.bin/ssh/sshd.88
-rw-r--r--usr.bin/ssh/sshd.c7
2 files changed, 11 insertions, 4 deletions
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 4611c0638df..da95eaef717 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd.8,v 1.113 2001/04/10 09:13:22 itojun Exp $
+.\" $OpenBSD: sshd.8,v 1.114 2001/04/11 16:25:31 lebel Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
@@ -43,7 +43,7 @@
.Nd OpenSSH ssh daemon
.Sh SYNOPSIS
.Nm sshd
-.Op Fl diqD46
+.Op Fl deiqD46
.Op Fl b Ar bits
.Op Fl f Ar config_file
.Op Fl g Ar login_grace_time
@@ -263,6 +263,10 @@ When this option is specified
will not detach and does not become a daemon.
This allows easy monitoring of
.Nm sshd .
+.It Fl e
+When this option is specified,
+.Nm
+will send the output to the standard error instead of the system log.
.It Fl V Ar client_protocol_id
SSH-2 compatibility mode.
When this option is specified
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index ed15824edba..15bdffcf377 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.191 2001/04/05 10:42:57 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.192 2001/04/11 16:25:30 lebel Exp $");
#include <openssl/dh.h>
#include <openssl/bn.h>
@@ -552,7 +552,7 @@ main(int ac, char **av)
initialize_server_options(&options);
/* Parse command-line arguments. */
- while ((opt = getopt(ac, av, "f:p:b:k:h:g:V:u:dDiqQ46")) != -1) {
+ while ((opt = getopt(ac, av, "f:p:b:k:h:g:V:u:dDeiqQ46")) != -1) {
switch (opt) {
case '4':
IPv4or6 = AF_INET;
@@ -577,6 +577,9 @@ main(int ac, char **av)
case 'D':
no_daemon_flag = 1;
break;
+ case 'e':
+ log_stderr = 1;
+ break;
case 'i':
inetd_flag = 1;
break;