← Back to branch summary

~cjwatson/ubuntu/precise/openssh/precise-proposed

« back to all changes in this revision

Viewing changes to log.c

  • Committer: Colin Watson
  • Date: 2010-03-31 10:34:21 UTC
  • mto: (3160.1.286 experimental)
  • mto: This revision was merged to the branch mainline in revision 3201.
  • Revision ID: cjwatson@debian.org-20100331103421-ze2t1qh04zhk38qd
http://bugs.debian.org/280609
Drop most of our "LogLevel SILENT" (-qq) patch.  This was originally
introduced to match the behaviour of non-free SSH, in which -q does not
suppress fatal errors, but matching the behaviour of OpenSSH upstream is
much more important nowadays.  We no longer document that -q does not
suppress fatal errors (closes: #280609).  Migrate "LogLevel SILENT" to
"LogLevel QUIET" in sshd_config on upgrade.

Show diffs side-by-side

added added

removed removed

Lines of Context:
log.c
90
90
        LogLevel val;
91
91
} log_levels[] =
92
92
{
93
 
        { "SILENT",     SYSLOG_LEVEL_SILENT },
 
93
        { "SILENT",     SYSLOG_LEVEL_QUIET }, /* compatibility */
94
94
        { "QUIET",      SYSLOG_LEVEL_QUIET },
95
95
        { "FATAL",      SYSLOG_LEVEL_FATAL },
96
96
        { "ERROR",      SYSLOG_LEVEL_ERROR },
245
245
        argv0 = av0;
246
246
 
247
247
        switch (level) {
248
 
        case SYSLOG_LEVEL_SILENT:
249
248
        case SYSLOG_LEVEL_QUIET:
250
249
        case SYSLOG_LEVEL_FATAL:
251
250
        case SYSLOG_LEVEL_ERROR: