- markus@cvs.openbsd.org 2002/02/04 12:15:25

     [log.c log.h readconf.c servconf.c]
     add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1,
     fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@

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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.94 2002/01/04 17:59:17 stevesk Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.95 2002/02/04 12:15:25 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -591,10 +591,10 @@ parse_int:
                 intptr = (int *) &options->log_level;
                 arg = strdelim(&s);
                 value = log_level_number(arg);
-                if (value == (LogLevel) - 1)
+                if (value == SYSLOG_LEVEL_NOT_SET)
                         fatal("%.200s line %d: unsupported log level '%s'",
                             filename, linenum, arg ? arg : "<NONE>");
-                if (*activep && (LogLevel) * intptr == -1)
+                if (*activep && (LogLevel) *intptr == SYSLOG_LEVEL_NOT_SET)
                         *intptr = (LogLevel) value;
                 break;
 
@@ -794,7 +794,7 @@ initialize_options(Options * options)
         options->num_local_forwards = 0;
         options->num_remote_forwards = 0;
         options->clear_forwardings = -1;
-        options->log_level = (LogLevel) - 1;
+        options->log_level = SYSLOG_LEVEL_NOT_SET;
         options->preferred_authentications = NULL;
         options->bind_address = NULL;
         options->smartcard_device = NULL;
@@ -911,7 +911,7 @@ fill_default_options(Options * options)
                 options->system_hostfile2 = _PATH_SSH_SYSTEM_HOSTFILE2;
         if (options->user_hostfile2 == NULL)
                 options->user_hostfile2 = _PATH_SSH_USER_HOSTFILE2;
-        if (options->log_level == (LogLevel) - 1)
+        if (options->log_level == SYSLOG_LEVEL_NOT_SET)
                 options->log_level = SYSLOG_LEVEL_INFO;
         if (options->clear_forwardings == 1)
                 clear_forwardings(options);