* Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL.

3 files changed, 9 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 9bf8e12f5..70cd08d63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:4.6p1-2) UNRELEASED; urgency=low
+
+  * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 13 Jun 2007 00:56:45 +0100
+
 openssh (1:4.6p1-1) unstable; urgency=low
 
   * New upstream release (closes: #395507, #397961, #420035). Important
diff --git a/log.c b/log.c
index f7256d8e5..1c2f515f4 100644
--- a/log.c
+++ b/log.c
@@ -90,8 +90,8 @@ static struct {
 } log_levels[] =
 {
         { "SILENT",     SYSLOG_LEVEL_SILENT },
-        { "FATAL",      SYSLOG_LEVEL_FATAL },
         { "QUIET",      SYSLOG_LEVEL_QUIET },
+        { "FATAL",      SYSLOG_LEVEL_FATAL },
         { "ERROR",      SYSLOG_LEVEL_ERROR },
         { "INFO",       SYSLOG_LEVEL_INFO },
         { "VERBOSE",    SYSLOG_LEVEL_VERBOSE },
@@ -223,8 +223,8 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
 
         switch (level) {
         case SYSLOG_LEVEL_SILENT:
-        case SYSLOG_LEVEL_FATAL:
         case SYSLOG_LEVEL_QUIET:
+        case SYSLOG_LEVEL_FATAL:
         case SYSLOG_LEVEL_ERROR:
         case SYSLOG_LEVEL_INFO:
         case SYSLOG_LEVEL_VERBOSE:
diff --git a/log.h b/log.h
index 57e2ee5b4..9dac57901 100644
--- a/log.h
+++ b/log.h
@@ -36,8 +36,8 @@ typedef enum {
 
 typedef enum {
         SYSLOG_LEVEL_SILENT,
-        SYSLOG_LEVEL_FATAL,
         SYSLOG_LEVEL_QUIET,
+        SYSLOG_LEVEL_FATAL,
         SYSLOG_LEVEL_ERROR,
         SYSLOG_LEVEL_INFO,
         SYSLOG_LEVEL_VERBOSE,