summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-11-29 13:51:06 +1100
committerDamien Miller <djm@mindrot.org>2000-11-29 13:51:06 +1100
commit6dbfef63559c7ac29aa7a3fe27a12d814fbd0e83 (patch)
treeee88fd5735db038026558924022c21dacec5d1ff
parenta19cf47b0fa5cd16c1e471792109ce06023c9757 (diff)
- (djm) Add Redhat RPM patch for AUTHPRIV SyslogFacility
-rw-r--r--ChangeLog1
-rw-r--r--log-server.c5
-rw-r--r--log.c3
-rw-r--r--ssh.h4
-rw-r--r--sshd_config2
5 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 69698457..82847805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@
- (djm) Patch from Pekka Savola <Pekka.Savola@netcore.fi> to include a few
more manpage paths in fixpaths calls
- (djm) Also add xauth path at Pekka's suggestion.
+ - (djm) Add Redhat RPM patch for AUTHPRIV SyslogFacility
20001125
- (djm) Give up privs when reading seed file
diff --git a/log-server.c b/log-server.c
index de3d5cfe..943c3141 100644
--- a/log-server.c
+++ b/log-server.c
@@ -82,6 +82,11 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
case SYSLOG_FACILITY_AUTH:
log_facility = LOG_AUTH;
break;
+#ifdef LOG_AUTHPRIV
+ case SYSLOG_FACILITY_AUTHPRIV:
+ log_facility = LOG_AUTHPRIV;
+ break;
+#endif
case SYSLOG_FACILITY_LOCAL0:
log_facility = LOG_LOCAL0;
break;
diff --git a/log.c b/log.c
index ce89c59b..e75c6c46 100644
--- a/log.c
+++ b/log.c
@@ -187,6 +187,9 @@ static struct {
{ "DAEMON", SYSLOG_FACILITY_DAEMON },
{ "USER", SYSLOG_FACILITY_USER },
{ "AUTH", SYSLOG_FACILITY_AUTH },
+#ifdef LOG_AUTHPRIV
+ { "AUTHPRIV", SYSLOG_FACILITY_AUTHPRIV },
+#endif
{ "LOCAL0", SYSLOG_FACILITY_LOCAL0 },
{ "LOCAL1", SYSLOG_FACILITY_LOCAL1 },
{ "LOCAL2", SYSLOG_FACILITY_LOCAL2 },
diff --git a/ssh.h b/ssh.h
index bb103fe4..2c2afd5a 100644
--- a/ssh.h
+++ b/ssh.h
@@ -20,6 +20,7 @@
#include <netinet/in.h> /* For struct sockaddr_in */
#include <pwd.h> /* For struct pw */
#include <stdarg.h> /* For va_list */
+#include <syslog.h> /* For LOG_AUTH and friends */
#include <sys/socket.h> /* For struct sockaddr_storage */
#include "fake-socket.h" /* For struct sockaddr_storage */
#ifdef HAVE_SYS_SELECT_H
@@ -427,6 +428,9 @@ typedef enum {
SYSLOG_FACILITY_DAEMON,
SYSLOG_FACILITY_USER,
SYSLOG_FACILITY_AUTH,
+#ifdef LOG_AUTHPRIV
+ SYSLOG_FACILITY_AUTHPRIV,
+#endif
SYSLOG_FACILITY_LOCAL0,
SYSLOG_FACILITY_LOCAL1,
SYSLOG_FACILITY_LOCAL2,
diff --git a/sshd_config b/sshd_config
index f368b97a..357c4250 100644
--- a/sshd_config
+++ b/sshd_config
@@ -23,7 +23,7 @@ PrintMotd yes
KeepAlive yes
# Logging
-SyslogFacility AUTH
+SyslogFacility AUTHPRIV
LogLevel INFO
#obsoletes QuietMode and FascistLogging