move Syslog_* defs into sudo.h

diff --git a/config.h.in b/config.h.in
index ce8b3dcf9ff4d3818e1724c39840dc8a588fc31f..04a4048eb455b1152f47792c8e71e1e67145123c 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -418,27 +418,4 @@
 #  define EXEC execvp
 #endif /* USE_EXECV */
 
-/*
- * syslog(3) parameters
- */
-
-#if (LOGGING & SLOG_SYSLOG)
-#  include <syslog.h>
-#  ifndef Syslog_ident
-#    define Syslog_ident       "sudo"
-#  endif
-#  ifndef Syslog_options
-#    define Syslog_options     0
-#  endif
-#  if !defined(Syslog_facility) && defined(LOG_NFACILITIES)
-#    define Syslog_facility    LOGFAC
-#  endif
-#  ifndef Syslog_priority_OK
-#    define Syslog_priority_OK LOG_NOTICE
-#  endif
-#  ifndef Syslog_priority_NO
-#    define Syslog_priority_NO LOG_ALERT
-#  endif
-#endif /* LOGGING & SLOG_SYSLOG */
-
 #endif /* _SUDO_CONFIG_H */

diff --git a/sudo.h b/sudo.h
index e4cb764d5842ffee17dcc74c386f51cb9eed73c3..ff9446b6115fa6e6a599e8c95270093c1ae5eaed 100644 (file)
--- a/sudo.h
+++ b/sudo.h
@@ -109,10 +109,33 @@ struct generic_alias {
 #  define MAXSYSLOGLEN         960
 #endif
 
+/*
+ * syslog(3) parameters
+ */
+
 #define SLOG_SYSLOG              0x01
 #define SLOG_FILE                0x02
 #define SLOG_BOTH                0x03
 
+#if (LOGGING & SLOG_SYSLOG)
+#  include <syslog.h>
+#  ifndef Syslog_ident
+#    define Syslog_ident       "sudo"
+#  endif
+#  ifndef Syslog_options
+#    define Syslog_options     0
+#  endif
+#  if !defined(Syslog_facility) && defined(LOG_NFACILITIES)
+#    define Syslog_facility    LOGFAC
+#  endif
+#  ifndef Syslog_priority_OK
+#    define Syslog_priority_OK LOG_NOTICE
+#  endif
+#  ifndef Syslog_priority_NO
+#    define Syslog_priority_NO LOG_ALERT
+#  endif
+#endif /* LOGGING & SLOG_SYSLOG */
+
 #define VALIDATE_OK              0x00
 #define VALIDATE_NO_USER         0x01
 #define VALIDATE_NOT_OK          0x02