security/bsmtrace: backport the -fno-common fix

This port is the older version of bsmtrace and should go away in due time,
but it's easy enough to backport the fix in the meantime. This version did
need an additional fix to log.{c,h} that was no longer needed in 3.x.

PR:		248756
Approved by:	csjp (maintainer, also discussed with)
MFH:		2020Q3 (-fno-common build fix)
This commit is contained in:
Kyle Evans 2020-08-24 00:28:44 +00:00
parent 39046188c5
commit c6372e4636
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=546029
5 changed files with 48 additions and 1 deletions

View File

@ -1,5 +1,13 @@
--- bsmtrace.c.orig 2014-01-14 22:51:19 UTC
+++ bsmtrace.c
@@ -30,6 +30,7 @@
#include "includes.h"
static int daemonized; /* daemonized or not? */
+int audit_pipe_fd;
/*
* If we are going to be daemonized, write out a pid file to
@@ -92,7 +92,7 @@ bsmtrace_exit(int x)
}

View File

@ -1,6 +1,13 @@
--- bsmtrace.h.orig 2014-02-05 02:34:38 UTC
+++ bsmtrace.h
@@ -43,6 +43,6 @@ int audit_pipe_fd; /* XXX not happy abou
@@ -38,11 +38,11 @@ int audit_pipe_fd; /* XXX not happy abou
char *pflag;
};
-struct g_conf opts;
-int audit_pipe_fd; /* XXX not happy about this global */
+extern struct g_conf opts;
+extern int audit_pipe_fd; /* XXX not happy about this global */
void bsmtrace_error(int, char *, ...);
void bsmtrace_exit(int);

View File

@ -0,0 +1,10 @@
--- conf.c.orig 2014-01-14 22:51:19 UTC
+++ conf.c
@@ -54,6 +54,7 @@ extern int yyparse(void);
bsm_set_head_t bsm_set_head;
int lineno = 1;
char *conffile;
+struct g_conf opts;
/*
* Return BSM set named str, or NULL if the set was not found in the BSM set

View File

@ -0,0 +1,11 @@
--- log.c.orig 2020-08-23 21:49:15 UTC
+++ log.c
@@ -31,6 +31,8 @@
#include "includes.h"
#undef SYSLOG_NAMES
+struct logchannel_head log_head;
+
int
log_bsm_syslog(struct logchannel *lc, struct bsm_sequence *bs,
struct bsm_record_data *br);

View File

@ -0,0 +1,11 @@
--- log.h.orig 2020-08-23 21:49:13 UTC
+++ log.h
@@ -30,7 +30,7 @@
#ifndef LOG_H_
#define LOG_H_
-TAILQ_HEAD(, logchannel) log_head;
+extern TAILQ_HEAD(logchannel_head, logchannel) log_head;
enum {
LOG_CHANNEL_NOP,