Revise how set_aumessage_mode is exposed

Author: stevegrubb

common/common.h

@@ -94,13 +94,9 @@ void wall_message(const char *fmt, ...)
 
 typedef enum { MSG_STDERR, MSG_SYSLOG, MSG_QUIET } message_t;
 typedef enum { DBG_NO, DBG_YES } debug_message_t;
+void _set_aumessage_mode(message_t mode, debug_message_t debug);
 
 AUDIT_HIDDEN_END
 
-// Leave this exposed until 2027, then hide it for good.
-// This allows programs already compiled to keep working.
-// But new programs can't see it.
-void set_aumessage_mode(message_t mode, debug_message_t debug);
-
 #endif
 

common/message.c

@@ -33,7 +33,7 @@
 static message_t message_mode = MSG_QUIET;
 static debug_message_t debug_message = DBG_NO;
 
-void set_aumessage_mode(message_t mode, debug_message_t debug)
+void _set_aumessage_mode(message_t mode, debug_message_t debug)
 {
         message_mode = mode;
 	debug_message = debug;

lib/libaudit.c

@@ -2211,3 +2211,11 @@ int audit_can_read(void)
 #endif
 }
 
+// Leave this exposed until 2027, then hide it for good.
+// This allows programs already compiled to keep working.
+// But new programs can't see it.
+void set_aumessage_mode(message_t mode, debug_message_t debug)
+{
+	_set_aumessage_mode(mode, debug);
+}
+

src/auditctl.c

@@ -1690,7 +1690,7 @@ int main(int argc, char *argv[])
 {
 	int retval = 1;
 
-	set_aumessage_mode(MSG_STDERR, DBG_NO);
+	_set_aumessage_mode(MSG_STDERR, DBG_NO);
 
 	if (argc == 1) {
 		usage();
@@ -1710,7 +1710,7 @@ int main(int argc, char *argv[])
 	if ((argc == 3) && (strcmp(argv[1], "-R") == 0)) {
 		// If reading a file, its most likely start up. Send problems
 		// to syslog where they will persist for later review
-		set_aumessage_mode(MSG_SYSLOG, DBG_NO);
+		_set_aumessage_mode(MSG_SYSLOG, DBG_NO);
 		fd = audit_open();
 		if (is_ready() == 0)
 			return 1;
@@ -1784,9 +1784,9 @@ static int handle_request(int status)
 					audit_rule_syscallbyname_data(
 							rule_new, "all");
 			}
-			set_aumessage_mode(MSG_QUIET, DBG_NO);
+			_set_aumessage_mode(MSG_QUIET, DBG_NO);
 			rc = audit_add_rule_data(fd, rule_new, add, action);
-			set_aumessage_mode(MSG_STDERR, DBG_NO);
+			_set_aumessage_mode(MSG_STDERR, DBG_NO);
 			/* Retry for legacy kernels */
 			if (rc < 0) {
 				if (errno == EINVAL &&
@@ -1808,10 +1808,10 @@ static int handle_request(int status)
 					audit_rule_syscallbyname_data(
 							rule_new, "all");
 			}
-			set_aumessage_mode(MSG_QUIET, DBG_NO);
+			_set_aumessage_mode(MSG_QUIET, DBG_NO);
 			rc = audit_delete_rule_data(fd, rule_new,
 								 del, action);
-			set_aumessage_mode(MSG_STDERR, DBG_NO);
+			_set_aumessage_mode(MSG_STDERR, DBG_NO);
 			/* Retry for legacy kernels */
 			if (rc < 0) {
 				if (errno == EINVAL &&

src/auditd.c

@@ -784,10 +784,10 @@ int main(int argc, char *argv[])
 
 	if (opt_foreground) {
 		config.daemonize = D_FOREGROUND;
-		set_aumessage_mode(MSG_STDERR, DBG_YES);
+		_set_aumessage_mode(MSG_STDERR, DBG_YES);
 	} else {
 		config.daemonize = D_BACKGROUND;
-		set_aumessage_mode(MSG_SYSLOG, DBG_NO);
+		_set_aumessage_mode(MSG_SYSLOG, DBG_NO);
 		(void) umask( umask( 077 ) | 022 );
 	}
 	session = audit_get_session();

src/aureport.c

@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 	limit.rlim_max = RLIM_INFINITY;
 	setrlimit(RLIMIT_FSIZE, &limit);
 	setrlimit(RLIMIT_CPU, &limit);
-	set_aumessage_mode(MSG_STDERR, DBG_NO);
+	_set_aumessage_mode(MSG_STDERR, DBG_NO);
 	set_allow_links(1); // auditd might have -l flag, aureport should be lenient here
 	(void) umask( umask( 077 ) | 027 );
 	very_first_event.sec = 0;

src/ausearch.c

@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
 	limit.rlim_max = RLIM_INFINITY;
 	setrlimit(RLIMIT_FSIZE, &limit);
 	setrlimit(RLIMIT_CPU, &limit);
-	set_aumessage_mode(MSG_STDERR, DBG_NO);
+	_set_aumessage_mode(MSG_STDERR, DBG_NO);
 	set_allow_links(1); // auditd might have -l flag, ausearch should be lenient here
 	(void) umask( umask( 077 ) | 027 );