now works with 4.2BSD syslog (blech)

diff --git a/logging.c b/logging.c
index 5120ad9fcf4f5fb92a2ea5202a017ae701e97b61..536399654f9dcdc82847711602ea12a9e864059d 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -233,7 +233,12 @@ void log_error(code)
        send_mail();
 
 #ifdef SYSLOG
+#ifdef Syslog_facility
     openlog(Syslog_ident, Syslog_options, Syslog_facility);
+#else
+    openlog(Syslog_ident, Syslog_options);
+#endif /* Syslog_facility */
+
     /*
      * Log the full line, breaking into multiple syslog(3) calls if necesary
      */

diff --git a/sudo.h b/sudo.h
index 0227b341deeaa3c23282f47d4c4a2476726db4d1..23bc28bae4c5d88d3f1004dc261d68967319b793 100644 (file)
--- a/sudo.h
+++ b/sudo.h
@@ -222,6 +222,7 @@ typedef struct list {
 /*
  * Syslog(3) parameters
  */
+
 #ifdef SYSLOG
 #  include <syslog.h>
 #  ifndef Syslog_ident
@@ -230,7 +231,7 @@ typedef struct list {
 #  ifndef Syslog_options
 #    define Syslog_options     0
 #  endif
-#  ifndef Syslog_facility
+#  if !defined(Syslog_facility) && defined(LOG_LOCAL2)
 #    define Syslog_facility    LOG_LOCAL2
 #  endif
 #  ifndef Syslog_priority_OK