From 41327992680cfb8dd602ea92d6902448dd66413d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <mailto:lennart@poettering.net>
Date: Tue, 7 Sep 2010 13:06:04 +0200
Subject: acquire /dev/log socket optionally from systemd

---
 plugins/imuxsock/Makefile.am |  4 ++--
 plugins/imuxsock/imuxsock.c  | 50 +++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/imuxsock/Makefile.am b/plugins/imuxsock/Makefile.am
index a2fe0baa..8803937f 100644
--- a/plugins/imuxsock/Makefile.am
+++ b/plugins/imuxsock/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = imuxsock.la
 
-imuxsock_la_SOURCES = imuxsock.c
+imuxsock_la_SOURCES = imuxsock.c ../../runtime/sd-daemon.c ../../runtime/sd-daemon.h
 imuxsock_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
 imuxsock_la_LDFLAGS = -module -avoid-version
-imuxsock_la_LIBADD = 
+imuxsock_la_LIBADD =
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 046f12f0..db53fcb6 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -47,6 +47,7 @@
 #include "prop.h"
 #include "debug.h"
 #include "unlimited_select.h"
+#include "sd-daemon.h"
 
 MODULE_TYPE_INPUT
 
@@ -74,7 +75,7 @@ DEFobjCurrIf(prop)
 
 static prop_t *pLocalHostIP = NULL;	/* there is only one global IP for all internally-generated messages */
 static prop_t *pInputName = NULL;	/* our inputName currently is always "imudp", and this will hold it */
-static int startIndexUxLocalSockets; /* process funix from that index on (used to 
+static int startIndexUxLocalSockets; /* process funix from that index on (used to
  				   * suppress local logging. rgerhards 2005-08-01
 				   * read-only after startup
 				   */
@@ -177,7 +178,7 @@ static rsRetVal discardFunixn(void)
 			prop.Destruct(&(funixHName[i]));
 		}
 	}
-	
+
 	return RS_RET_OK;
 }
 
@@ -190,6 +191,40 @@ static int create_unix_socket(const char *path, int bCreatePath)
 	if (path[0] == '\0')
 		return -1;
 
+       if (strcmp(path, _PATH_LOG) == 0) {
+               int r;
+
+               /* Check whether an FD was passed in from systemd. If
+                * so, it's the /dev/log socket, so use it. */
+
+               r = sd_listen_fds(0);
+               if (r < 0) {
+                       errmsg.LogError(-r, NO_ERRCODE, "Failed to acquire systemd socket");
+                       return -1;
+               }
+
+               if (r > 1) {
+                       errmsg.LogError(EINVAL, NO_ERRCODE, "Wrong number of systemd sockets passed");
+                       return -1;
+               }
+
+               if (r == 1) {
+                       fd = SD_LISTEN_FDS_START;
+                       r = sd_is_socket_unix(fd, SOCK_DGRAM, -1, _PATH_LOG, 0);
+                       if (r < 0) {
+                               errmsg.LogError(-r, NO_ERRCODE, "Failed to verify systemd socket type");
+                               return -1;
+                       }
+
+                       if (!r) {
+                               errmsg.LogError(EINVAL, NO_ERRCODE, "Passed systemd socket of wrong type");
+                               return -1;
+                       }
+
+                       return fd;
+               }
+       }
+
 	unlink(path);
 
 	memset(&sunx, 0, sizeof(sunx));
@@ -391,12 +426,17 @@ CODESTARTafterRun
 	int i;
 	/* do cleanup here */
 	/* Close the UNIX sockets. */
-        for (i = 0; i < nfunix; i++)
+       for (i = 0; i < nfunix; i++)
 		if (funix[i] != -1)
 			close(funix[i]);
 
-	/* Clean-up files. */
-	for(i = startIndexUxLocalSockets; i < nfunix; i++)
+       /* Clean-up files. If systemd passed us a socket it is
+        * systemd's job to clean it up.*/
+       if (sd_listen_fds(0) > 0)
+               i = 1;
+       else
+               i = startIndexUxLocalSockets;
+       for(; i < nfunix; i++)
 		if (funixn[i] && funix[i] != -1)
 			unlink((char*) funixn[i]);
 	/* free no longer needed string */
-- 
cgit 


From 21a2672222a1b403ff0811154dec156676bed732 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 8 Sep 2010 12:46:03 +0200
Subject: moved systemd interface to rsyslog convenience lib

Mostly a refresh of sd-daemon.[ch] from its source plus some make file changes.
We now have systemd interfaces inside rsyslog, so that all plugins interested can
call the interfaces. Seems not to be totally necessary right now, but will help
in the long term.
---
 plugins/imuxsock/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/imuxsock/Makefile.am b/plugins/imuxsock/Makefile.am
index 8803937f..28f9f9e3 100644
--- a/plugins/imuxsock/Makefile.am
+++ b/plugins/imuxsock/Makefile.am
@@ -1,6 +1,6 @@
 pkglib_LTLIBRARIES = imuxsock.la
 
-imuxsock_la_SOURCES = imuxsock.c ../../runtime/sd-daemon.c ../../runtime/sd-daemon.h
-imuxsock_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
+imuxsock_la_SOURCES = imuxsock.c
+imuxsock_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
 imuxsock_la_LDFLAGS = -module -avoid-version
-imuxsock_la_LIBADD =
+imuxsock_la_LIBADD = $(RSRT_LIBS)
-- 
cgit