sgrubb f37518
diff -ur audit-2.7.7.orig/src/auditd.c audit-2.7.7/src/auditd.c
sgrubb f37518
--- audit-2.7.7.orig/src/auditd.c	2017-06-16 15:01:41.000000000 -0400
sgrubb f37518
+++ audit-2.7.7/src/auditd.c	2017-07-14 10:54:46.390612992 -0400
sgrubb f37518
@@ -692,6 +692,7 @@
sgrubb f37518
 		return 1;
sgrubb f37518
 	}
sgrubb f37518
 
sgrubb f37518
+       	audit_msg(LOG_WARNING, "Starting dispatcher");
sgrubb f37518
 	if (init_dispatcher(&config)) {
sgrubb f37518
 		if (pidfile)
sgrubb f37518
 			unlink(pidfile);
sgrubb f37518
@@ -701,6 +702,7 @@
sgrubb f37518
 	}
sgrubb f37518
 
sgrubb f37518
 	/* Get machine name ready for use */
sgrubb f37518
+       	audit_msg(LOG_WARNING, "Resolving node");
sgrubb f37518
 	if (resolve_node(&config)) {
sgrubb f37518
 		if (pidfile)
sgrubb f37518
 			unlink(pidfile);
sgrubb f37518
@@ -710,6 +712,7 @@
sgrubb f37518
 	}
sgrubb f37518
 
sgrubb f37518
 	/* Setup the reconfig notification pipe */
sgrubb f37518
+       	audit_msg(LOG_WARNING, "Creating reconfig socket");
sgrubb f37518
 	if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipefds)) {
sgrubb f37518
         	audit_msg(LOG_ERR, "Cannot open reconfig socket");
sgrubb f37518
 		if (pidfile)
sgrubb f37518
@@ -718,19 +721,23 @@
sgrubb f37518
 		free_config(&config);
sgrubb f37518
 		return 1;
sgrubb f37518
 	}
sgrubb f37518
+       	audit_msg(LOG_WARNING, "Setting CLOEXEC");
sgrubb f37518
 	fcntl(pipefds[0], F_SETFD, FD_CLOEXEC);
sgrubb f37518
 	fcntl(pipefds[1], F_SETFD, FD_CLOEXEC);
sgrubb f37518
 
sgrubb f37518
 	/* This had to wait until now so the child exec has happened */
sgrubb f37518
+       	audit_msg(LOG_WARNING, "Making dispatcher fd private");
sgrubb f37518
 	make_dispatcher_fd_private();
sgrubb f37518
 
sgrubb f37518
 	/* Write message to log that we are alive */
sgrubb f37518
+       	audit_msg(LOG_WARNING, "Creating DAEMON_START event");
sgrubb f37518
 	{
sgrubb f37518
 		struct utsname ubuf;
sgrubb f37518
 		char start[DEFAULT_BUF_SZ];
sgrubb f37518
 		const char *fmt = audit_lookup_format((int)config.log_format);
sgrubb f37518
 		if (fmt == NULL)
sgrubb f37518
 			fmt = "UNKNOWN";
sgrubb f37518
+       		audit_msg(LOG_WARNING, "Calling uname");
sgrubb f37518
 		if (uname(&ubuf) != 0) {
sgrubb f37518
 			if (pidfile)
sgrubb f37518
 				unlink(pidfile);
sgrubb f37518
@@ -739,6 +746,7 @@
sgrubb f37518
 			free_config(&config);
sgrubb f37518
 			return 1;
sgrubb f37518
 		}
sgrubb f37518
+       		audit_msg(LOG_WARNING, "Getting subject");
sgrubb f37518
 		if (getsubj(subj))
sgrubb f37518
 			snprintf(start, sizeof(start),
sgrubb f37518
 				"op=start ver=%s format=%s "
sgrubb f37518
@@ -755,6 +763,7 @@
sgrubb f37518
 				VERSION, fmt, ubuf.release,
sgrubb f37518
 				audit_getloginuid(), getpid(),
sgrubb f37518
 				getuid(), session);
sgrubb f37518
+       		audit_msg(LOG_WARNING, "Sending event");
sgrubb f37518
 		if (send_audit_event(AUDIT_DAEMON_START, start)) {
sgrubb f37518
         		audit_msg(LOG_ERR, "Cannot send start message");
sgrubb f37518
 			if (pidfile)
sgrubb f37518
@@ -765,14 +774,18 @@
sgrubb f37518
 			free_config(&config);
sgrubb f37518
 			return 1;
sgrubb f37518
 		}
sgrubb f37518
+       		audit_msg(LOG_WARNING, "Event sent");
sgrubb f37518
 	}
sgrubb f37518
 
sgrubb f37518
 	/* Tell kernel not to kill us */
sgrubb f37518
+	audit_msg(LOG_WARNING, "Avoiding oom");
sgrubb f37518
 	avoid_oom_killer();
sgrubb f37518
 
sgrubb f37518
 	/* let config manager init */
sgrubb f37518
+	audit_msg(LOG_WARNING, "Initting config manager");
sgrubb f37518
 	init_config_manager();
sgrubb f37518
 
sgrubb f37518
+	audit_msg(LOG_WARNING, "Setting enabled");
sgrubb f37518
 	if (opt_startup != startup_nochange && !opt_aggregate_only &&
sgrubb f37518
 			(audit_is_enabled(fd) < 2) &&
sgrubb f37518
 			audit_set_enabled(fd, (int)opt_startup) < 0) {
sgrubb f37518
@@ -805,6 +818,7 @@
sgrubb f37518
 	}
sgrubb f37518
 
sgrubb f37518
 	/* Tell the kernel we are alive */
sgrubb f37518
+	audit_msg(LOG_WARNING, "Setting pid");
sgrubb f37518
 	if (!opt_aggregate_only && audit_set_pid(fd, getpid(), WAIT_YES) < 0) {
sgrubb f37518
 		char emsg[DEFAULT_BUF_SZ];
sgrubb f37518
 		if (*subj)
sgrubb f37518
@@ -833,13 +847,16 @@
sgrubb f37518
 	}
sgrubb f37518
 
sgrubb f37518
 	/* Depending on value of opt_startup (-s) set initial audit state */
sgrubb f37518
+	audit_msg(LOG_WARNING, "Creating event loop");
sgrubb f37518
 	loop = ev_default_loop (EVFLAG_NOENV);
sgrubb f37518
 
sgrubb f37518
 	if (!opt_aggregate_only) {
sgrubb f37518
+		audit_msg(LOG_WARNING, "Setting netlink handler");
sgrubb f37518
 		ev_io_init (&netlink_watcher, netlink_handler, fd, EV_READ);
sgrubb f37518
 		ev_io_start (loop, &netlink_watcher);
sgrubb f37518
 	}
sgrubb f37518
 
sgrubb f37518
+	audit_msg(LOG_WARNING, "Setting signal handlers");
sgrubb f37518
 	ev_signal_init (&sigterm_watcher, term_handler, SIGTERM);
sgrubb f37518
 	ev_signal_start (loop, &sigterm_watcher);
sgrubb f37518
 
sgrubb f37518
@@ -855,11 +872,14 @@
sgrubb f37518
 	ev_signal_init (&sigchld_watcher, child_handler, SIGCHLD);
sgrubb f37518
 	ev_signal_start (loop, &sigchld_watcher);
sgrubb f37518
 
sgrubb f37518
+	audit_msg(LOG_WARNING, "Setting pipe handler");
sgrubb f37518
 	ev_io_init (&pipe_watcher, pipe_handler, pipefds[0], EV_READ);
sgrubb f37518
 	ev_io_start (loop, &pipe_watcher);
sgrubb f37518
 
sgrubb f37518
+	audit_msg(LOG_WARNING, "Starting tcp handler");
sgrubb f37518
 	if (auditd_tcp_listen_init(loop, &config)) {
sgrubb f37518
 		char emsg[DEFAULT_BUF_SZ];
sgrubb f37518
+		audit_msg(LOG_WARNING, "Start failed");
sgrubb f37518
 		if (*subj)
sgrubb f37518
 			snprintf(emsg, sizeof(emsg),
sgrubb f37518
 				"op=network-init auid=%u pid=%d uid=%u "