| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657 |
- --- a/src/ulogd.c
- +++ b/src/ulogd.c
- @@ -83,7 +83,7 @@ static char *ulogd_logfile = NULL;
- static const char *ulogd_configfile = ULOGD_CONFIGFILE;
- static const char *ulogd_pidfile = NULL;
- static int ulogd_pidfile_fd = -1;
- -static FILE syslog_dummy;
- +static int ulogd_use_syslog = 0;
-
- static int info_mode = 0;
-
- @@ -427,7 +427,7 @@ void __ulogd_log(int level, char *file,
- if (level < loglevel_ce.u.value)
- return;
-
- - if (logfile == &syslog_dummy) {
- + if (ulogd_use_syslog) {
- /* FIXME: this omits the 'file' string */
- va_start(ap, format);
- vsyslog(ulogd2syslog_level(level), format, ap);
- @@ -950,7 +950,7 @@ static int logfile_open(const char *name
- logfile = stdout;
- } else if (!strcmp(name, "syslog")) {
- openlog("ulogd", LOG_PID, LOG_DAEMON);
- - logfile = &syslog_dummy;
- + ulogd_use_syslog = 1;
- } else {
- logfile = fopen(ulogd_logfile, "a");
- if (!logfile) {
- @@ -1240,7 +1240,7 @@ static void sigterm_handler(int signal)
- unload_plugins();
- #endif
-
- - if (logfile != NULL && logfile != stdout && logfile != &syslog_dummy) {
- + if (logfile != NULL && logfile != stdout) {
- fclose(logfile);
- logfile = NULL;
- }
- @@ -1262,7 +1262,7 @@ static void signal_handler(int signal)
- switch (signal) {
- case SIGHUP:
- /* reopen logfile */
- - if (logfile != stdout && logfile != &syslog_dummy) {
- + if (logfile != NULL && logfile != stdout) {
- fclose(logfile);
- logfile = fopen(ulogd_logfile, "a");
- if (!logfile) {
- --- a/filter/raw2packet/ulogd_raw2packet_BASE.c
- +++ b/filter/raw2packet/ulogd_raw2packet_BASE.c
- @@ -42,6 +42,7 @@
- #include <ulogd/ulogd.h>
- #include <ulogd/ipfix_protocol.h>
- #include <netinet/if_ether.h>
- +#include <linux/types.h>
- #include <string.h>
-
- enum input_keys {
|
