In auditd, prevent plugin restarts by syncing stop to dispatcher immediately

Updated the SIGTERM handler in auditd to shut down the dispatcher before
stopping the event loop

Author: stevegrubb

ChangeLog

@@ -5,6 +5,7 @@
 - Add support for "exec" action in max_log_file_action in auditd
 - Refactor auparse code to be multi-thread safe
 - Add memory pool to netlink event processing to reduce memory churn
+- In auditd, prevern plugin restarts by syncing stop to dispatcher immediately
 
 4.0.5
 - Rework audisp queue to be lockless

src/auditd.c

@@ -127,10 +127,11 @@ static void usage(void)
 
 /*
  * SIGTERM handler
- */ 
+ */
 static void term_handler(struct ev_loop *loop, struct ev_signal *sig,
 			int revents)
 {
+	libdisp_shutdown();
 	EV_STOP ();
 }
 
@@ -1122,11 +1123,8 @@ int main(int argc, char *argv[])
 	ev_io_stop (loop, &pipe_watcher);
 	close_pipes();
 
-	// Give DAEMON_END event a little time to be sent in case
-	// of remote logging
+	// Give DAEMON_END event a little time
 	usleep(10000); // 10 milliseconds
-	libdisp_shutdown();
-	usleep(20000); // 20 milliseconds
 
 	// Tear down IO watchers Part 3
 	ev_signal_stop(loop, &sigchld_watcher);