diff options
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | log.c | 4 | ||||
-rw-r--r-- | log.h | 2 |
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 @@ | |||
1 | openssh (1:4.6p1-2) UNRELEASED; urgency=low | ||
2 | |||
3 | * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL. | ||
4 | |||
5 | -- Colin Watson <cjwatson@debian.org> Wed, 13 Jun 2007 00:56:45 +0100 | ||
6 | |||
1 | openssh (1:4.6p1-1) unstable; urgency=low | 7 | openssh (1:4.6p1-1) unstable; urgency=low |
2 | 8 | ||
3 | * New upstream release (closes: #395507, #397961, #420035). Important | 9 | * New upstream release (closes: #395507, #397961, #420035). Important |
@@ -90,8 +90,8 @@ static struct { | |||
90 | } log_levels[] = | 90 | } log_levels[] = |
91 | { | 91 | { |
92 | { "SILENT", SYSLOG_LEVEL_SILENT }, | 92 | { "SILENT", SYSLOG_LEVEL_SILENT }, |
93 | { "FATAL", SYSLOG_LEVEL_FATAL }, | ||
94 | { "QUIET", SYSLOG_LEVEL_QUIET }, | 93 | { "QUIET", SYSLOG_LEVEL_QUIET }, |
94 | { "FATAL", SYSLOG_LEVEL_FATAL }, | ||
95 | { "ERROR", SYSLOG_LEVEL_ERROR }, | 95 | { "ERROR", SYSLOG_LEVEL_ERROR }, |
96 | { "INFO", SYSLOG_LEVEL_INFO }, | 96 | { "INFO", SYSLOG_LEVEL_INFO }, |
97 | { "VERBOSE", SYSLOG_LEVEL_VERBOSE }, | 97 | { "VERBOSE", SYSLOG_LEVEL_VERBOSE }, |
@@ -223,8 +223,8 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr) | |||
223 | 223 | ||
224 | switch (level) { | 224 | switch (level) { |
225 | case SYSLOG_LEVEL_SILENT: | 225 | case SYSLOG_LEVEL_SILENT: |
226 | case SYSLOG_LEVEL_FATAL: | ||
227 | case SYSLOG_LEVEL_QUIET: | 226 | case SYSLOG_LEVEL_QUIET: |
227 | case SYSLOG_LEVEL_FATAL: | ||
228 | case SYSLOG_LEVEL_ERROR: | 228 | case SYSLOG_LEVEL_ERROR: |
229 | case SYSLOG_LEVEL_INFO: | 229 | case SYSLOG_LEVEL_INFO: |
230 | case SYSLOG_LEVEL_VERBOSE: | 230 | case SYSLOG_LEVEL_VERBOSE: |
@@ -36,8 +36,8 @@ typedef enum { | |||
36 | 36 | ||
37 | typedef enum { | 37 | typedef enum { |
38 | SYSLOG_LEVEL_SILENT, | 38 | SYSLOG_LEVEL_SILENT, |
39 | SYSLOG_LEVEL_FATAL, | ||
40 | SYSLOG_LEVEL_QUIET, | 39 | SYSLOG_LEVEL_QUIET, |
40 | SYSLOG_LEVEL_FATAL, | ||
41 | SYSLOG_LEVEL_ERROR, | 41 | SYSLOG_LEVEL_ERROR, |
42 | SYSLOG_LEVEL_INFO, | 42 | SYSLOG_LEVEL_INFO, |
43 | SYSLOG_LEVEL_VERBOSE, | 43 | SYSLOG_LEVEL_VERBOSE, |