diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sshd.8 | 8 | ||||
-rw-r--r-- | sshd.c | 7 |
3 files changed, 18 insertions, 5 deletions
@@ -18,6 +18,12 @@ | |||
18 | - markus@cvs.openbsd.org 2001/04/11 13:56:13 | 18 | - markus@cvs.openbsd.org 2001/04/11 13:56:13 |
19 | [channels.c ssh.c] | 19 | [channels.c ssh.c] |
20 | https-connect and socks5 support. i feel so bad. | 20 | https-connect and socks5 support. i feel so bad. |
21 | - lebel@cvs.openbsd.org 2001/04/11 16:25:30 | ||
22 | [sshd.8 sshd.c] | ||
23 | implement the -e option into sshd: | ||
24 | -e When this option is specified, sshd will send the output to the | ||
25 | standard error instead of the system log. | ||
26 | markus@ OK. | ||
21 | 27 | ||
22 | 20010410 | 28 | 20010410 |
23 | - OpenBSD CVS Sync | 29 | - OpenBSD CVS Sync |
@@ -5011,4 +5017,4 @@ | |||
5011 | - Wrote replacements for strlcpy and mkdtemp | 5017 | - Wrote replacements for strlcpy and mkdtemp |
5012 | - Released 1.0pre1 | 5018 | - Released 1.0pre1 |
5013 | 5019 | ||
5014 | $Id: ChangeLog,v 1.1099 2001/04/11 23:08:17 mouring Exp $ | 5020 | $Id: ChangeLog,v 1.1100 2001/04/11 23:10:09 mouring Exp $ |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd.8,v 1.113 2001/04/10 09:13:22 itojun Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.114 2001/04/11 16:25:31 lebel Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -43,7 +43,7 @@ | |||
43 | .Nd OpenSSH ssh daemon | 43 | .Nd OpenSSH ssh daemon |
44 | .Sh SYNOPSIS | 44 | .Sh SYNOPSIS |
45 | .Nm sshd | 45 | .Nm sshd |
46 | .Op Fl diqD46 | 46 | .Op Fl deiqD46 |
47 | .Op Fl b Ar bits | 47 | .Op Fl b Ar bits |
48 | .Op Fl f Ar config_file | 48 | .Op Fl f Ar config_file |
49 | .Op Fl g Ar login_grace_time | 49 | .Op Fl g Ar login_grace_time |
@@ -263,6 +263,10 @@ When this option is specified | |||
263 | will not detach and does not become a daemon. | 263 | will not detach and does not become a daemon. |
264 | This allows easy monitoring of | 264 | This allows easy monitoring of |
265 | .Nm sshd . | 265 | .Nm sshd . |
266 | .It Fl e | ||
267 | When this option is specified, | ||
268 | .Nm | ||
269 | will send the output to the standard error instead of the system log. | ||
266 | .It Fl V Ar client_protocol_id | 270 | .It Fl V Ar client_protocol_id |
267 | SSH-2 compatibility mode. | 271 | SSH-2 compatibility mode. |
268 | When this option is specified | 272 | When this option is specified |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.191 2001/04/05 10:42:57 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.192 2001/04/11 16:25:30 lebel Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -565,7 +565,7 @@ main(int ac, char **av) | |||
565 | initialize_server_options(&options); | 565 | initialize_server_options(&options); |
566 | 566 | ||
567 | /* Parse command-line arguments. */ | 567 | /* Parse command-line arguments. */ |
568 | while ((opt = getopt(ac, av, "f:p:b:k:h:g:V:u:dDiqQ46")) != -1) { | 568 | while ((opt = getopt(ac, av, "f:p:b:k:h:g:V:u:dDeiqQ46")) != -1) { |
569 | switch (opt) { | 569 | switch (opt) { |
570 | case '4': | 570 | case '4': |
571 | IPv4or6 = AF_INET; | 571 | IPv4or6 = AF_INET; |
@@ -590,6 +590,9 @@ main(int ac, char **av) | |||
590 | case 'D': | 590 | case 'D': |
591 | no_daemon_flag = 1; | 591 | no_daemon_flag = 1; |
592 | break; | 592 | break; |
593 | case 'e': | ||
594 | log_stderr = 1; | ||
595 | break; | ||
593 | case 'i': | 596 | case 'i': |
594 | inetd_flag = 1; | 597 | inetd_flag = 1; |
595 | break; | 598 | break; |