From patchwork Tue Apr 21 07:30:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 463005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BC87614011D for ; Tue, 21 Apr 2015 17:31:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=Mm2IXzXF; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id CD212280143; Tue, 21 Apr 2015 09:30:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 94D1D280143 for ; Tue, 21 Apr 2015 09:29:58 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 21 Apr 2015 09:29:55 +0200 (CEST) Received: by wgso17 with SMTP id o17so203899046wgs.1 for ; Tue, 21 Apr 2015 00:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=xifgsHbfDDv1Zkq7ni9egBaEgwx6KavB8xq5vaalNug=; b=Mm2IXzXFwijPOfkpeNlCB+xwhIXu9wVF6oUmos8fS5PS5MLW/hVsOUnnf6pVqVirO5 /4AmTiHCedavTVe42FMpi3y1XMYL8MDEtdsUfr+5Lpca8cMcWcW47QhLPhrYul9Fz3Xy gUYRMcHr5TGMBgT23mZRZgD+QauV1qFy+1wBqLB53B0IVqFLKQ5z36Eg25T4SxU6A3OT OhX9/Ee9DGpKwJv/PpoOLeHecNv9u/Qd+M+sNKyuSZwXs3wo0b/7xvVgAji/cgxi8pkI jLH3EQBppDBcXdmkfJGPVI0B0sYrisCBhbiFzZbFUfDQe87svpaNdUUs829xYNmIa6w5 PQgw== X-Received: by 10.194.63.80 with SMTP id e16mr20464916wjs.56.1429601452406; Tue, 21 Apr 2015 00:30:52 -0700 (PDT) Received: from orion.local ([194.105.29.179]) by mx.google.com with ESMTPSA id dx11sm1338851wjb.23.2015.04.21.00.30.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Apr 2015 00:30:51 -0700 (PDT) From: Alexandru Ardelean To: openwrt-devel@lists.openwrt.org Date: Tue, 21 Apr 2015 10:30:44 +0300 Message-Id: <1429601445-2905-1-git-send-email-ardeleanalex@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [OpenWrt-Devel] [PATCH 1/2] lldpd: remove patch 001 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Alexandru Ardelean --- ...lookup-for-_lldpd-when-privsep-is-disable.patch | 73 ---------------------- 1 file changed, 73 deletions(-) delete mode 100644 package/network/services/lldpd/patches/001-priv-don-t-lookup-for-_lldpd-when-privsep-is-disable.patch 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 907c21b..0000000 --- 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 -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 -