From: Vincent Bernat <vincent@bernat.im>
Date: Wed, 18 Mar 2015 14:42:24 +0000 (+0100)
Subject: Revert "priv: on Linux, when monitor dies, kill child"
X-Git-Tag: 0.7.14~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55764ecb9c62530141a0dc43273c9597268f2b8c;p=thirdparty%2Flldpd.git

Revert "priv: on Linux, when monitor dies, kill child"

This reverts commit 4747e964096a1b490de062460608805c46f0cfd2. This
commit is now useless due to the previous (more portable) commits. It is
harmless but also unneeded.
---

diff --git a/src/daemon/lldpd.h b/src/daemon/lldpd.h
index c93128ad..4c10aa1f 100644
--- a/src/daemon/lldpd.h
+++ b/src/daemon/lldpd.h
@@ -222,7 +222,6 @@ client_handle_client(struct lldpd *cfg,
 
 /* priv.c */
 void	 priv_init(const char*, int, uid_t, gid_t);
-void	 priv_init_os(void);
 void	 priv_wait(void);
 void	 priv_ctl_cleanup(const char *ctlname);
 char   	*priv_gethostname(void);
diff --git a/src/daemon/priv-bsd.c b/src/daemon/priv-bsd.c
index 3b13b757..f32f990c 100644
--- a/src/daemon/priv-bsd.c
+++ b/src/daemon/priv-bsd.c
@@ -26,11 +26,6 @@
 #include <errno.h>
 #include <string.h>
 
-void
-priv_init_os()
-{
-}
-
 int
 asroot_iface_init_os(int ifindex, char *name, int *fd)
 {
diff --git a/src/daemon/priv-linux.c b/src/daemon/priv-linux.c
index cc140879..abcec86c 100644
--- a/src/daemon/priv-linux.c
+++ b/src/daemon/priv-linux.c
@@ -20,24 +20,15 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <signal.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <regex.h>
 #include <sys/ioctl.h>
-#include <sys/prctl.h>
 #include <netpacket/packet.h> /* For sockaddr_ll */
 #include <linux/filter.h>     /* For BPF filtering */
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 
-void
-priv_init_os()
-{
-	if (prctl(PR_SET_PDEATHSIG, SIGTERM) == -1)
-		log_warn("privsep", "unable to setup parent death signal");
-}
-
 /* Proxy for open */
 int
 priv_open(char *file)
diff --git a/src/daemon/priv.c b/src/daemon/priv.c
index 37147358..7b3c5eca 100644
--- a/src/daemon/priv.c
+++ b/src/daemon/priv.c
@@ -634,7 +634,6 @@ priv_init(const char *chrootdir, int ctl, uid_t uid, gid_t gid)
 #endif
 		}
 		close(pair[1]);
-		priv_init_os();
 		priv_ping();
 		break;
 	default: