diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/readconf.c b/readconf.c index 650a11994..7920ac86d 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.94 2002/01/04 17:59:17 stevesk Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.95 2002/02/04 12:15:25 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -591,10 +591,10 @@ parse_int: | |||
591 | intptr = (int *) &options->log_level; | 591 | intptr = (int *) &options->log_level; |
592 | arg = strdelim(&s); | 592 | arg = strdelim(&s); |
593 | value = log_level_number(arg); | 593 | value = log_level_number(arg); |
594 | if (value == (LogLevel) - 1) | 594 | if (value == SYSLOG_LEVEL_NOT_SET) |
595 | fatal("%.200s line %d: unsupported log level '%s'", | 595 | fatal("%.200s line %d: unsupported log level '%s'", |
596 | filename, linenum, arg ? arg : "<NONE>"); | 596 | filename, linenum, arg ? arg : "<NONE>"); |
597 | if (*activep && (LogLevel) * intptr == -1) | 597 | if (*activep && (LogLevel) *intptr == SYSLOG_LEVEL_NOT_SET) |
598 | *intptr = (LogLevel) value; | 598 | *intptr = (LogLevel) value; |
599 | break; | 599 | break; |
600 | 600 | ||
@@ -794,7 +794,7 @@ initialize_options(Options * options) | |||
794 | options->num_local_forwards = 0; | 794 | options->num_local_forwards = 0; |
795 | options->num_remote_forwards = 0; | 795 | options->num_remote_forwards = 0; |
796 | options->clear_forwardings = -1; | 796 | options->clear_forwardings = -1; |
797 | options->log_level = (LogLevel) - 1; | 797 | options->log_level = SYSLOG_LEVEL_NOT_SET; |
798 | options->preferred_authentications = NULL; | 798 | options->preferred_authentications = NULL; |
799 | options->bind_address = NULL; | 799 | options->bind_address = NULL; |
800 | options->smartcard_device = NULL; | 800 | options->smartcard_device = NULL; |
@@ -911,7 +911,7 @@ fill_default_options(Options * options) | |||
911 | options->system_hostfile2 = _PATH_SSH_SYSTEM_HOSTFILE2; | 911 | options->system_hostfile2 = _PATH_SSH_SYSTEM_HOSTFILE2; |
912 | if (options->user_hostfile2 == NULL) | 912 | if (options->user_hostfile2 == NULL) |
913 | options->user_hostfile2 = _PATH_SSH_USER_HOSTFILE2; | 913 | options->user_hostfile2 = _PATH_SSH_USER_HOSTFILE2; |
914 | if (options->log_level == (LogLevel) - 1) | 914 | if (options->log_level == SYSLOG_LEVEL_NOT_SET) |
915 | options->log_level = SYSLOG_LEVEL_INFO; | 915 | options->log_level = SYSLOG_LEVEL_INFO; |
916 | if (options->clear_forwardings == 1) | 916 | if (options->clear_forwardings == 1) |
917 | clear_forwardings(options); | 917 | clear_forwardings(options); |