diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2015-05-28 16:19:38 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-05-28 16:19:38 +0000 |
commit | 8df45565e92a1712f5e25d101104319a4c5dcf7f (patch) | |
tree | fba4e19a5c05a909b4fb825c13ef543adc91f011 /package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch | |
parent | 7d44f7630f172047c6e936bc3caef61005abc779 (diff) | |
download | upstream-8df45565e92a1712f5e25d101104319a4c5dcf7f.tar.gz upstream-8df45565e92a1712f5e25d101104319a4c5dcf7f.tar.bz2 upstream-8df45565e92a1712f5e25d101104319a4c5dcf7f.zip |
lldpd: update to v0.7.15 and add support for parsing /etc/openwrt_release
Also drop superseded patches.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 45810
Diffstat (limited to 'package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch')
-rw-r--r-- | package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch b/package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch deleted file mode 100644 index 907c21b685..0000000000 --- a/package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 28bf40220840c277d70ed66f6d58729ebb975de8 Mon Sep 17 00:00:00 2001 -From: Vincent Bernat <vincent@bernat.im> -Date: Thu, 12 Feb 2015 08:07:43 +0100 -Subject: [PATCH] priv: don't lookup for _lldpd when privsep is disabled - -Closes #95 ---- - src/daemon/lldpd.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c -index f868fc7..6a3a160 100644 ---- a/src/daemon/lldpd.c -+++ b/src/daemon/lldpd.c -@@ -1335,11 +1335,13 @@ lldpd_main(int argc, char *argv[], char *envp[]) - int receiveonly = 0; - int ctl; - -+#ifdef ENABLE_PRIVSEP - /* Non privileged user */ - struct passwd *user; - struct group *group; - uid_t uid; - gid_t gid; -+#endif - - saved_argv = argv; - -@@ -1493,12 +1495,14 @@ lldpd_main(int argc, char *argv[], char *envp[]) - log_debug("main", "lldpd starting..."); - - /* Grab uid and gid to use for priv sep */ -+#ifdef ENABLE_PRIVSEP - if ((user = getpwnam(PRIVSEP_USER)) == NULL) - fatal("main", "no " PRIVSEP_USER " user for privilege separation"); - uid = user->pw_uid; - if ((group = getgrnam(PRIVSEP_GROUP)) == NULL) - fatal("main", "no " PRIVSEP_GROUP " group for privilege separation"); - gid = group->gr_gid; -+#endif - - /* Create and setup socket */ - int retry = 1; -@@ -1526,12 +1530,14 @@ lldpd_main(int argc, char *argv[], char *envp[]) - log_warn("main", "unable to create control socket"); - fatalx("giving up"); - } -+#ifdef ENABLE_PRIVSEP - if (chown(ctlname, uid, gid) == -1) - log_warn("main", "unable to chown control socket"); - if (chmod(ctlname, - S_IRUSR | S_IWUSR | S_IXUSR | - S_IRGRP | S_IWGRP | S_IXGRP) == -1) - log_warn("main", "unable to chmod control socket"); -+#endif - - /* Disable SIGPIPE */ - signal(SIGPIPE, SIG_IGN); -@@ -1576,7 +1582,11 @@ lldpd_main(int argc, char *argv[], char *envp[]) - } - - log_debug("main", "initialize privilege separation"); -+#ifdef ENABLE_PRIVSEP - priv_init(PRIVSEP_CHROOT, ctl, uid, gid); -+#else -+ priv_init(PRIVSEP_CHROOT, ctl, 0, 0); -+#endif - - /* Initialization of global configuration */ - if ((cfg = (struct lldpd *) --- -2.1.2 - |