From 851dbdb775e409cf9f55e51bd8e07139d2f8930b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 13 May 1998 08:12:51 +0000 Subject: [PATCH] added "syslog facility" option. It is an integer and defaults to the value of LOG_DAEMON. --- loadparm.c | 6 ++++++ log.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/loadparm.c b/loadparm.c index 38c539c7..3afa9f44 100644 --- a/loadparm.c +++ b/loadparm.c @@ -98,6 +98,7 @@ static BOOL bLoaded = False; typedef struct { char *motd_file; + int syslog_facility; } global; static global Globals; @@ -150,6 +151,7 @@ static BOOL bInGlobalSection = True; static struct parm_struct parm_table[] = { {"motd file", P_STRING, P_GLOBAL, &Globals.motd_file, NULL, 0}, + {"syslog facility", P_INTEGER, P_GLOBAL, &Globals.syslog_facility, NULL,0}, {"name", P_STRING, P_LOCAL, &sDefault.name, NULL, 0}, {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, 0}, {"path", P_STRING, P_LOCAL, &sDefault.path, NULL, 0}, @@ -168,6 +170,9 @@ Initialise the global parameter structure. ***************************************************************************/ static void init_globals(void) { +#ifdef LOG_DAEMON + Globals.syslog_facility = LOG_DAEMON; +#endif } /*************************************************************************** @@ -203,6 +208,7 @@ static void init_locals(void) FN_GLOBAL_STRING(lp_motd_file, &Globals.motd_file) +FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility) FN_LOCAL_STRING(lp_name, name) FN_LOCAL_STRING(lp_comment, comment) FN_LOCAL_STRING(lp_path, path) diff --git a/log.c b/log.c index ebf796b6..19339c76 100644 --- a/log.c +++ b/log.c @@ -55,7 +55,7 @@ void rprintf(int fd, const char *format, ...) if (!initialised) { initialised = 1; #ifdef LOG_DAEMON - openlog("rsyncd", LOG_PID, LOG_DAEMON); + openlog("rsyncd", LOG_PID, lp_syslog_facility()); #else openlog("rsyncd", LOG_PID); #endif -- 2.34.1