Portable OpenSSH 2.5.1p1: daemontools-aware?

[Jos Backus]

On Wed, Feb 21, 2001 at 12:52:17AM -0500, Jim Knoble wrote:
> I'd rather see this option called '-L' rather than '-e', so as to be
> parallel with '-D'.  Comments?

Fine with me.

I forgot to add the option to the usage text. Here's the complete patch again.

diff -ur openssh-2.5.1p1.dist/sshd.8 openssh-2.5.1p1/sshd.8
--- openssh-2.5.1p1.dist/sshd.8	Wed Feb 14 19:08:06 2001
+++ openssh-2.5.1p1/sshd.8	Wed Feb 21 12:05:40 2001
@@ -43,7 +43,7 @@
 .Nd secure shell daemon
 .Sh SYNOPSIS
 .Nm sshd
-.Op Fl diqD46
+.Op Fl diqDL46
 .Op Fl b Ar bits
 .Op Fl f Ar config_file
 .Op Fl g Ar login_grace_time
@@ -256,6 +256,8 @@
 should be put into the
 .Pa utmp
 file.
+.It Fl L
+Force logging output to be sent to standard error instead of syslogd(8).
 .It Fl D
 When this option is specified
 .Nm
diff -ur openssh-2.5.1p1.dist/sshd.c openssh-2.5.1p1/sshd.c
--- openssh-2.5.1p1.dist/sshd.c	Sun Feb 18 11:13:12 2001
+++ openssh-2.5.1p1/sshd.c	Wed Feb 21 12:04:57 2001
@@ -576,7 +576,7 @@
 	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:dDiLqQ46")) != -1) {
 		switch (opt) {
 		case '4':
 			IPv4or6 = AF_INET;
@@ -601,6 +601,9 @@
 		case 'D':
 			no_daemon_flag = 1;
 			break;
+		case 'L':
+			log_stderr = 1;
+			break;
 		case 'i':
 			inetd_flag = 1;
 			break;
@@ -651,6 +654,7 @@
 			fprintf(stderr, "  -d         Debugging mode (multiple -d means more debugging)\n");
 			fprintf(stderr, "  -i         Started from inetd\n");
 			fprintf(stderr, "  -D         Do not fork into daemon mode\n");
+			fprintf(stderr, "  -L         Force logging to standard error\n");
 			fprintf(stderr, "  -q         Quiet (no logging)\n");
 			fprintf(stderr, "  -p port    Listen on the specified port (default: 22)\n");
 			fprintf(stderr, "  -k seconds Regenerate server key every this many seconds (default: 3600)\n");

-- 
Jos Backus                 _/  _/_/_/        "Modularity is not a hack."
                          _/  _/   _/                -- D. J. Bernstein
                         _/  _/_/_/             
                    _/  _/  _/    _/
josb at cncdsl.com     _/_/   _/_/_/            use Std::Disclaimer;