diff options
| -rw-r--r-- | common/eurephia_log.c | 5 | ||||
| -rw-r--r-- | common/eurephia_log.h | 2 | ||||
| -rw-r--r-- | eurephiadm/client_context.c | 9 | ||||
| -rw-r--r-- | eurephiadm/client_context.h | 2 | ||||
| -rw-r--r-- | eurephiadm/eurephiadm.c | 2 | ||||
| -rw-r--r-- | plugin/eurephia.c | 4 | ||||
| -rw-r--r-- | utils/eurephia_init.c | 2 |
7 files changed, 15 insertions, 11 deletions
diff --git a/common/eurephia_log.c b/common/eurephia_log.c index 94c901a..dde99d8 100644 --- a/common/eurephia_log.c +++ b/common/eurephia_log.c @@ -270,6 +270,7 @@ void eurephia_log_close(eurephiaCTX *ctx) { * Initialises and preapres the log device * * @param ctx eurephiaCTX where the log context will be associated + * @param ident Log ident. Used when logging to syslog primarily, to identify log entries in syslog logs * @param dest Log destination. For can be a file name, "syslog:", "stdout:", "stderr:" or "none:". * If it is "syslog:" it must continue with a string describing log facility such as * "syslog:authpriv", "syslog:local0", "syslog:local1", "syslog:user", etc. If the @@ -279,7 +280,7 @@ void eurephia_log_close(eurephiaCTX *ctx) { * * @return Returns 1 on success, otherwise 0; */ -int eurephia_log_init(eurephiaCTX *ctx, const char *dest, int loglevel) { +int eurephia_log_init(eurephiaCTX *ctx, const char *ident, const char *dest, int loglevel) { assert( (ctx != NULL) && (dest != NULL) ); @@ -322,7 +323,7 @@ int eurephia_log_init(eurephiaCTX *ctx, const char *dest, int loglevel) { break; case logSYSLOG: // Open syslog - openlog("eurephia", LOG_PID, syslog_logdest(ctx->log->destination)); + openlog(ident, LOG_PID, syslog_logdest(ctx->log->destination)); break; } ctx->log->opened = 1; diff --git a/common/eurephia_log.h b/common/eurephia_log.h index 77511d0..d059735 100644 --- a/common/eurephia_log.h +++ b/common/eurephia_log.h @@ -54,7 +54,7 @@ #warning ########################################################################################## #endif -int eurephia_log_init(eurephiaCTX *ctx, const char *dest, int loglvl); +int eurephia_log_init(eurephiaCTX *ctx, const char *ident, const char *dest, int loglvl); void eurephia_log_close(eurephiaCTX *ctx); /** diff --git a/eurephiadm/client_context.c b/eurephiadm/client_context.c index 1a8fc0b..45405c7 100644 --- a/eurephiadm/client_context.c +++ b/eurephiadm/client_context.c @@ -44,12 +44,15 @@ * be configured in the configuration. * * @param log String containing log destination + * @param logident String used to identify log entries when logging to syslog * @param loglevel Set the log level (verbosity) * @param cfg eurephiaVALUES pointer to the configuration * * @return Returns a pointer to a eurephiaCTX, otherwise NULL. */ -eurephiaCTX *eurephiaCTX_init(const char *log, const int loglevel, eurephiaVALUES *cfg) { +eurephiaCTX *eurephiaCTX_init(const char *logident, const char *log, + const int loglevel, eurephiaVALUES *cfg) +{ eurephiaCTX *ctx = NULL; char *dbdriver = NULL, *logfile = NULL; int cfgloglvl = 0; @@ -70,12 +73,12 @@ eurephiaCTX *eurephiaCTX_init(const char *log, const int loglevel, eurephiaVALUE logfile = eGet_value(cfg, "log"); if( (logfile != NULL) && (log == NULL) ) { - eurephia_log_init(ctx, logfile, (loglevel > 0 ? loglevel : cfgloglvl)); + eurephia_log_init(ctx, logident, logfile, (loglevel > 0 ? loglevel : cfgloglvl)); } else { // If log file is not set in config, use input log parameter. But if // no log file is defined even here, use stderr. If no logging is wanted, it // must be defined as none: in the config file. - eurephia_log_init(ctx, (log != NULL ? log : "stderr:"), + eurephia_log_init(ctx, logident, (log != NULL ? log : "stderr:"), (loglevel > 0 ? loglevel : cfgloglvl)); } diff --git a/eurephiadm/client_context.h b/eurephiadm/client_context.h index ef6f5a4..96bc431 100644 --- a/eurephiadm/client_context.h +++ b/eurephiadm/client_context.h @@ -31,7 +31,7 @@ #ifndef EUREPHIA_CLIENT_CONTEXT #define EUREPHIA_CLIENT_CONTEXT -eurephiaCTX *eurephiaCTX_init(const char *log, const int loglevel, eurephiaVALUES *cfg); +eurephiaCTX *eurephiaCTX_init(const char *logident, const char *log, const int loglevel, eurephiaVALUES *cfg); void eurephiaCTX_destroy(eurephiaCTX *ctx); #endif diff --git a/eurephiadm/eurephiadm.c b/eurephiadm/eurephiadm.c index 4209e6a..21d39e2 100644 --- a/eurephiadm/eurephiadm.c +++ b/eurephiadm/eurephiadm.c @@ -426,7 +426,7 @@ int main(int argc, char **argv) { // // Create a eurephia context and load database driver - ctx = eurephiaCTX_init(logfile, loglevel, cfg); + ctx = eurephiaCTX_init("eurephiadm", logfile, loglevel, cfg); if( ctx == NULL ) { fprintf(stderr, "Could not initialise a eurephia context.\n"); return 3; diff --git a/plugin/eurephia.c b/plugin/eurephia.c index f93ee81..db7607f 100644 --- a/plugin/eurephia.c +++ b/plugin/eurephia.c @@ -186,10 +186,10 @@ eurephiaCTX *eurephiaInit(const char **argv) if( (logfile == NULL) || (strcmp(logfile, "openvpn:") == 0) ) { // If no logfile is given, or openvpn: is given, log to stderr which OpenVPN will // take care of - eurephia_log_init(ctx, "stderr:", loglvl); + eurephia_log_init(ctx, "eurephia-auth", "stderr:", loglvl); } else { // If another log file is given, process that - eurephia_log_init(ctx, logfile, loglvl); + eurephia_log_init(ctx, "eurephia-auth", logfile, loglvl); } // Load the database driver diff --git a/utils/eurephia_init.c b/utils/eurephia_init.c index e0f998d..00f6404 100644 --- a/utils/eurephia_init.c +++ b/utils/eurephia_init.c @@ -628,7 +628,7 @@ int main(int argc, char **argv) { } - ctx = eurephiaCTX_init(NULL, 0, cfg); + ctx = eurephiaCTX_init("eurephia_init", NULL, 0, cfg); if( ctx == NULL ) { fprintf(stderr, "Failed to initialise an eurephia context.\n"); return 3; |