void-packages/srcpkgs/ulogd/patches/musl-fixes.patch

63 lines
1.7 KiB
Diff

--- ulogd-2.0.3.orig/filter/raw2packet/ulogd_raw2packet_BASE.c
+++ ulogd-2.0.3/filter/raw2packet/ulogd_raw2packet_BASE.c
@@ -43,6 +43,7 @@
#include <ulogd/ipfix_protocol.h>
#include <netinet/if_ether.h>
#include <string.h>
+#include <linux/types.h>
enum input_keys {
INKEY_RAW_PCKT,
--- ulogd-2.0.3.orig/src/ulogd.c
+++ ulogd-2.0.3/src/ulogd.c
@@ -78,12 +78,12 @@
"(C) 2008-2012 Eric Leblond <eric@regit.org>\n"
/* global variables */
+static int log_to_syslog = 0;
static FILE *logfile = NULL; /* logfile pointer */
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 info_mode = 0;
@@ -427,7 +427,7 @@
if (level < loglevel_ce.u.value)
return;
- if (logfile == &syslog_dummy) {
+ if (log_to_syslog) {
/* FIXME: this omits the 'file' string */
va_start(ap, format);
vsyslog(ulogd2syslog_level(level), format, ap);
@@ -950,7 +950,7 @@
logfile = stdout;
} else if (!strcmp(name, "syslog")) {
openlog("ulogd", LOG_PID, LOG_DAEMON);
- logfile = &syslog_dummy;
+ log_to_syslog = 1;
} else {
logfile = fopen(ulogd_logfile, "a");
if (!logfile) {
@@ -1240,7 +1240,7 @@
unload_plugins();
#endif
- if (logfile != NULL && logfile != stdout && logfile != &syslog_dummy) {
+ if (logfile != NULL && logfile != stdout) {
fclose(logfile);
logfile = NULL;
}
@@ -1262,7 +1262,7 @@
switch (signal) {
case SIGHUP:
/* reopen logfile */
- if (logfile != stdout && logfile != &syslog_dummy) {
+ if (logfile != stdout && logfile != NULL) {
fclose(logfile);
logfile = fopen(ulogd_logfile, "a");
if (!logfile) {