Attachment 13 Details for Bug 90 – quiet options patch

[patch] quiet options patch

openssh-3.0p1-quiet.diff (text/plain), 2.89 KB, created by Matthew Vernon on 2002-01-31 21:23:32 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Vernon

Created: 2002-01-31 21:23:32 AEDT

Size: 2.89 KB

patch

obsolete

>--- log.c.orig	Sat Nov 24 19:08:52 2001
>+++ log.c	Sat Nov 24 18:51:56 2001
>@@ -76,8 +76,9 @@
> 	LogLevel val;
> } log_levels[] =
> {
>-	{ "QUIET",	SYSLOG_LEVEL_QUIET },
>+        { "SILENT",     SYSLOG_LEVEL_SILENT },
> 	{ "FATAL",	SYSLOG_LEVEL_FATAL },
>+	{ "QUIET",	SYSLOG_LEVEL_QUIET },
> 	{ "ERROR",	SYSLOG_LEVEL_ERROR },
> 	{ "INFO",	SYSLOG_LEVEL_INFO },
> 	{ "VERBOSE",	SYSLOG_LEVEL_VERBOSE },
>@@ -259,8 +260,9 @@
> 	argv0 = av0;
> 
> 	switch (level) {
>-	case SYSLOG_LEVEL_QUIET:
>+        case SYSLOG_LEVEL_SILENT:
> 	case SYSLOG_LEVEL_FATAL:
>+	case SYSLOG_LEVEL_QUIET:
> 	case SYSLOG_LEVEL_ERROR:
> 	case SYSLOG_LEVEL_INFO:
> 	case SYSLOG_LEVEL_VERBOSE:
>--- log.h.orig	Sat Nov 24 19:08:56 2001
>+++ log.h	Sat Nov 24 18:47:07 2001
>@@ -36,8 +36,9 @@
> }       SyslogFacility;
> 
> typedef enum {
>-	SYSLOG_LEVEL_QUIET,
>+        SYSLOG_LEVEL_SILENT,
> 	SYSLOG_LEVEL_FATAL,
>+	SYSLOG_LEVEL_QUIET,
> 	SYSLOG_LEVEL_ERROR,
> 	SYSLOG_LEVEL_INFO,
> 	SYSLOG_LEVEL_VERBOSE,
>--- ssh.1.orig	Sat Nov 24 19:09:08 2001
>+++ ssh.1	Sat Nov 24 19:11:03 2001
>@@ -518,6 +518,9 @@
> Quiet mode.
> Causes all warning and diagnostic messages to be suppressed.
> Only fatal errors are displayed.
>+If a second  
>+.Fl q 
>+is given then even fatal errors are suppressed.
> .It Fl s
> May be used to request invocation of a subsystem on the remote system. Subsystems are a feature of the SSH2 protocol which facilitate the use
> of SSH as a secure transport for other applications (eg. sftp). The
>--- ssh.c.orig	Sat Nov 24 19:08:40 2001
>+++ ssh.c	Sat Nov 24 19:03:27 2001
>@@ -411,7 +411,12 @@
> 				exit(0);
> 			break;
> 		case 'q':
>-			options.log_level = SYSLOG_LEVEL_QUIET;
>+    		        if (options.log_level == SYSLOG_LEVEL_QUIET) {
>+		                options.log_level = SYSLOG_LEVEL_SILENT;
>+		        }
>+		        else if (options.log_level != SYSLOG_LEVEL_SILENT) {
>+		                options.log_level = SYSLOG_LEVEL_QUIET;
>+		        }
> 			break;
> 		case 'e':
> 			if (optarg[0] == '^' && optarg[2] == 0 &&
>--- sshd.8.orig	Sat Nov 24 19:09:23 2001
>+++ sshd.8	Sat Nov 24 19:11:04 2001
>@@ -242,9 +242,12 @@
> (default 22).
> .It Fl q
> Quiet mode.
>-Nothing is sent to the system log.
>+Only fatal errors are sent to the system log.
> Normally the beginning,
> authentication, and termination of each connection is logged.
>+If a second 
>+.Fl q
>+is given then nothing is sent to the system log.
> .It Fl t
> Test mode.
> Only check the validity of the configuration file and sanity of the keys.
>--- sshd.c.orig	Sat Nov 24 19:08:43 2001
>+++ sshd.c	Sat Nov 24 19:03:21 2001
>@@ -599,7 +599,12 @@
> 			/* ignored */
> 			break;
> 		case 'q':
>-			options.log_level = SYSLOG_LEVEL_QUIET;
>+		        if (options.log_level == SYSLOG_LEVEL_QUIET) { 
>+		                options.log_level = SYSLOG_LEVEL_SILENT; 
>+		        } 
>+		        else if (options.log_level != SYSLOG_LEVEL_SILENT) { 
>+		                options.log_level = SYSLOG_LEVEL_QUIET; 
>+		        } 
> 			break;
> 		case 'b':
> 			options.server_key_bits = atoi(optarg);

Actions: View | Diff

Attachments on bug 90: 13