Imported Upstream version 5.7.4upstream/5.7.4

4 files changed, 43 insertions, 13 deletions

diff --git a/tools/iminternal.c b/tools/iminternal.c
index bd1fa12..12534ba 100644
--- a/tools/iminternal.c
+++ b/tools/iminternal.c
@@ -89,7 +89,7 @@ finalize_it:
  * The interface of this function is modelled after syslogd/logmsg(),
  * for which it is an "replacement".
  */
-rsRetVal iminternalAddMsg(int pri, msg_t *pMsg)
+rsRetVal iminternalAddMsg(msg_t *pMsg)
 {
 	DEFiRet;
 	iminternal_t *pThis;
@@ -98,7 +98,6 @@ rsRetVal iminternalAddMsg(int pri, msg_t *pMsg)
 
 	CHKiRet(iminternalConstruct(&pThis));
 
-	pThis->pri = pri;
 	pThis->pMsg = pMsg;
 
 	CHKiRet(llAppend(&llMsgs,  NULL, (void*) pThis));
@@ -118,7 +117,7 @@ finalize_it:
  * from the list and return it to the caller. The caller is
  * responsible for freeing the message!
  */
-rsRetVal iminternalRemoveMsg(int *pPri, msg_t **ppMsg)
+rsRetVal iminternalRemoveMsg(msg_t **ppMsg)
 {
 	DEFiRet;
 	iminternal_t *pThis;
@@ -128,7 +127,6 @@ rsRetVal iminternalRemoveMsg(int *pPri, msg_t **ppMsg)
 	assert(ppMsg != NULL);
 
 	CHKiRet(llGetNextElt(&llMsgs, &llCookie, (void*)&pThis));
-	*pPri = pThis->pri;
 	*ppMsg = pThis->pMsg;
 	pThis->pMsg = NULL; /* we do no longer own it - important for destructor */
 
diff --git a/tools/iminternal.h b/tools/iminternal.h
index f1062a1..8a9e250 100644
--- a/tools/iminternal.h
+++ b/tools/iminternal.h
@@ -33,7 +33,6 @@
  * The short name is cslch (Configfile SysLine CommandHandler)
  */
 struct iminternal_s { /* config file sysline parse entry */
-	int pri;
 	msg_t *pMsg;	/* the message (in all its glory) */
 };
 typedef struct iminternal_s iminternal_t;
@@ -41,8 +40,8 @@ typedef struct iminternal_s iminternal_t;
 /* prototypes */
 rsRetVal modInitIminternal(void);
 rsRetVal modExitIminternal(void);
-rsRetVal iminternalAddMsg(int pri, msg_t *pMsg);
+rsRetVal iminternalAddMsg(msg_t *pMsg);
 rsRetVal iminternalHaveMsgReady(int* pbHaveOne);
-rsRetVal iminternalRemoveMsg(int *pPri, msg_t **ppMsg);
+rsRetVal iminternalRemoveMsg(msg_t **ppMsg);
 
 #endif /* #ifndef IMINTERNAL_H_INCLUDED */
diff --git a/tools/omdiscard.c b/tools/omdiscard.c
index f13144e..227ad8e 100644
--- a/tools/omdiscard.c
+++ b/tools/omdiscard.c
@@ -44,6 +44,7 @@ MODULE_TYPE_OUTPUT
 DEF_OMOD_STATIC_DATA
 
 typedef struct _instanceData {
+    	char dummy;
 } instanceData;
 
 /* we do not need a createInstance()!
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 19a5900..c4a3b27 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -574,7 +574,7 @@ logmsgInternal(int iErr, int pri, uchar *msg, int flags)
 	}
 
 	if(bHaveMainQueue == 0) { /* not yet in queued mode */
-		iminternalAddMsg(pri, pMsg);
+		iminternalAddMsg(pMsg);
 	} else {
                /* we have the queue, so we can simply provide the
 		 * message to the queue engine.
@@ -1868,10 +1868,9 @@ void sigttin_handler()
  */
 static inline void processImInternal(void)
 {
-	int iPri;
 	msg_t *pMsg;
 
-	while(iminternalRemoveMsg(&iPri, &pMsg) == RS_RET_OK) {
+	while(iminternalRemoveMsg(&pMsg) == RS_RET_OK) {
 		submitMsg(pMsg);
 	}
 }
@@ -2429,13 +2428,46 @@ doGlblProcessInit(void)
 				 */
 				exit(1); /* "good" exit - after forking, not diasabling anything */
 			}
+
 			num_fds = getdtablesize();
 			close(0);
 			/* we keep stdout and stderr open in case we have to emit something */
+			i = 3;
+
+			/* if (sd_booted()) */ {
+				const char *e;
+				char buf[24] = { '\0' };
+				char *p = NULL;
+				unsigned long l;
+				int sd_fds;
+
+				/* fork & systemd socket activation:
+				 * fetch listen pid and update to ours,
+				 * when it is set to pid of our parent.
+				 */
+				if ( (e = getenv("LISTEN_PID"))) {
+					errno = 0;
+					l = strtoul(e, &p, 10);
+					if (errno ==  0 && l > 0 && (!p || !*p)) {
+						if (getppid() == (pid_t)l) {
+							snprintf(buf, sizeof(buf), "%d",
+								 getpid());
+							setenv("LISTEN_PID", buf, 1);
+						}
+					}
+				}
+
+				/*
+				 * close only all further fds, except
+				 * of the fds provided by systemd.
+				 */
+				sd_fds = sd_listen_fds(0);
+				if (sd_fds > 0)
+					i = SD_LISTEN_FDS_START + sd_fds;
+			}
+			for ( ; i < num_fds; i++)
+				(void) close(i);
 
-                       if (sd_listen_fds(0) <= 0)
-                               for (i = 3; i < num_fds; i++)
-                                       (void) close(i);
 			untty();
 		} else {
 			fputs(" Already running. If you want to run multiple instances, you need "