Attachment #13 for bug #90

View | Details | Raw Unified | Return to bug 90
Collapse All | Expand All




	LogLevel val;
} log_levels[] =
{
        { "SILENT",     SYSLOG_LEVEL_SILENT },
	{ "FATAL",	SYSLOG_LEVEL_FATAL },
	{ "QUIET",	SYSLOG_LEVEL_QUIET },
	{ "ERROR",	SYSLOG_LEVEL_ERROR },
	{ "INFO",	SYSLOG_LEVEL_INFO },
	{ "VERBOSE",	SYSLOG_LEVEL_VERBOSE },

	argv0 = av0;

	switch (level) {
        case SYSLOG_LEVEL_SILENT:
	case SYSLOG_LEVEL_FATAL:
	case SYSLOG_LEVEL_QUIET:
	case SYSLOG_LEVEL_ERROR:
	case SYSLOG_LEVEL_INFO:
	case SYSLOG_LEVEL_VERBOSE:

Lines 36-43 Link Here

(-)log.h.orig (-1 / +2 lines)
36	} SyslogFacility;	36	} SyslogFacility;
37		37
38	typedef enum {	38	typedef enum {
39	SYSLOG_LEVEL_QUIET,	39	SYSLOG_LEVEL_SILENT,
40	SYSLOG_LEVEL_FATAL,	40	SYSLOG_LEVEL_FATAL,
		41	SYSLOG_LEVEL_QUIET,
41	SYSLOG_LEVEL_ERROR,	42	SYSLOG_LEVEL_ERROR,
42	SYSLOG_LEVEL_INFO,	43	SYSLOG_LEVEL_INFO,
43	SYSLOG_LEVEL_VERBOSE,	44	SYSLOG_LEVEL_VERBOSE,

Lines 518-523 Link Here

(-)ssh.1.orig (+3 lines)
518	Quiet mode.	518	Quiet mode.
519	Causes all warning and diagnostic messages to be suppressed.	519	Causes all warning and diagnostic messages to be suppressed.
520	Only fatal errors are displayed.	520	Only fatal errors are displayed.
		521	If a second
		522	.Fl q
		523	is given then even fatal errors are suppressed.
521	.It Fl s	524	.It Fl s
522	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	525	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
523	of SSH as a secure transport for other applications (eg. sftp). The	526	of SSH as a secure transport for other applications (eg. sftp). The

Lines 411-417 Link Here

(-)ssh.c.orig (-1 / +6 lines)
411	exit(0);	411	exit(0);
412	break;	412	break;
413	case 'q':	413	case 'q':
414	options.log_level = SYSLOG_LEVEL_QUIET;	414	if (options.log_level == SYSLOG_LEVEL_QUIET) {
		415	options.log_level = SYSLOG_LEVEL_SILENT;
		416	}
		417	else if (options.log_level != SYSLOG_LEVEL_SILENT) {
		418	options.log_level = SYSLOG_LEVEL_QUIET;
		419	}
415	break;	420	break;
416	case 'e':	421	case 'e':
417	if (optarg[0] == '^' && optarg[2] == 0 &&	422	if (optarg[0] == '^' && optarg[2] == 0 &&

Lines 242-250 Link Here

(-)sshd.8.orig (-1 / +4 lines)
242	(default 22).	242	(default 22).
243	.It Fl q	243	.It Fl q
244	Quiet mode.	244	Quiet mode.
245	Nothing is sent to the system log.	245	Only fatal errors are sent to the system log.
246	Normally the beginning,	246	Normally the beginning,
247	authentication, and termination of each connection is logged.	247	authentication, and termination of each connection is logged.
		248	If a second
		249	.Fl q
		250	is given then nothing is sent to the system log.
248	.It Fl t	251	.It Fl t
249	Test mode.	252	Test mode.
250	Only check the validity of the configuration file and sanity of the keys.	253	Only check the validity of the configuration file and sanity of the keys.

Lines 599-605 Link Here

(-)sshd.c.orig (-1 / +6 lines)
599	/* ignored */	599	/* ignored */
600	break;	600	break;
601	case 'q':	601	case 'q':
602	options.log_level = SYSLOG_LEVEL_QUIET;	602	if (options.log_level == SYSLOG_LEVEL_QUIET) {
		603	options.log_level = SYSLOG_LEVEL_SILENT;
		604	}
		605	else if (options.log_level != SYSLOG_LEVEL_SILENT) {
		606	options.log_level = SYSLOG_LEVEL_QUIET;
		607	}
603	break;	608	break;
604	case 'b':	609	case 'b':
605	options.server_key_bits = atoi(optarg);	610	options.server_key_bits = atoi(optarg);

Return to bug 90

Lines 76-83 Link Here

(-)log.c.orig (-2 / +4 lines)
76	LogLevel val;	76	LogLevel val;
77	} log_levels[] =	77	} log_levels[] =
78	{	78	{
79	{ "QUIET", SYSLOG_LEVEL_QUIET },	79	{ "SILENT", SYSLOG_LEVEL_SILENT },
80	{ "FATAL", SYSLOG_LEVEL_FATAL },	80	{ "FATAL", SYSLOG_LEVEL_FATAL },
		81	{ "QUIET", SYSLOG_LEVEL_QUIET },
81	{ "ERROR", SYSLOG_LEVEL_ERROR },	82	{ "ERROR", SYSLOG_LEVEL_ERROR },
82	{ "INFO", SYSLOG_LEVEL_INFO },	83	{ "INFO", SYSLOG_LEVEL_INFO },
83	{ "VERBOSE", SYSLOG_LEVEL_VERBOSE },	84	{ "VERBOSE", SYSLOG_LEVEL_VERBOSE },
Lines 259-266 Link Here
259	argv0 = av0;	260	argv0 = av0;
260		261
261	switch (level) {	262	switch (level) {
262	case SYSLOG_LEVEL_QUIET:	263	case SYSLOG_LEVEL_SILENT:
263	case SYSLOG_LEVEL_FATAL:	264	case SYSLOG_LEVEL_FATAL:
		265	case SYSLOG_LEVEL_QUIET:
264	case SYSLOG_LEVEL_ERROR:	266	case SYSLOG_LEVEL_ERROR:
265	case SYSLOG_LEVEL_INFO:	267	case SYSLOG_LEVEL_INFO:
266	case SYSLOG_LEVEL_VERBOSE:	268	case SYSLOG_LEVEL_VERBOSE: