- lebel@cvs.openbsd.org 2001/04/11 16:25:30

     [sshd.8 sshd.c]
     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.

diff --git a/ChangeLog b/ChangeLog
index bd87b53bc97a5b71318e95640d2b5c0364d5ee42..022b0a9f009b22a65ea37ec15c50c292eb52d1aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,12 @@
    - markus@cvs.openbsd.org 2001/04/11 13:56:13
      [channels.c ssh.c]
      https-connect and socks5 support. i feel so bad.
+   - lebel@cvs.openbsd.org 2001/04/11 16:25:30
+     [sshd.8 sshd.c]
+     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.
 
 20010410
  - OpenBSD CVS Sync

diff --git a/sshd.8 b/sshd.8
index 4611c0638df7b51d1de96aff7eb6cf64d2418cc2..da95eaef717d29489b877fdbd0867730c866dd6e 100644 (file)
--- a/sshd.8
+++ b/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/sshd.c b/sshd.c
index 725961153deb584f7d4e7edb7c60c0e7f1230d5a..bde1ac344790803f8fad3162f14adcd1bd5df45e 100644 (file)
--- a/sshd.c
+++ b/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>
@@ -565,7 +565,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;
@@ -590,6 +590,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;