From patchwork Sat Sep 14 17:09:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1162363 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dRnKiO70"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46VzWf5590z9sCJ for ; Sun, 15 Sep 2019 03:09:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0566688287; Sat, 14 Sep 2019 17:09:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OyzpPP3w25AP; Sat, 14 Sep 2019 17:09:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 462298826F; Sat, 14 Sep 2019 17:09:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 725981BF286 for ; Sat, 14 Sep 2019 17:09:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6F2F88456F for ; Sat, 14 Sep 2019 17:09:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LHhvanYnwR6l for ; Sat, 14 Sep 2019 17:09:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 227CB841D4 for ; Sat, 14 Sep 2019 17:09:30 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id m15so1799466qtq.2 for ; Sat, 14 Sep 2019 10:09:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=2o4auP+nFs2eMYCJbfMVDVumtxkdZ+qvS5SnuwXHOOU=; b=dRnKiO70HbmMcpLZPh/ODJUzst9lwGGjhbbzFpOdcIlluYEoLrK+NWDdf4mZYc6Zkh 3MJ3EEfkjQHq0RaPxSSXUhV4YEzDMALUQqNOkEAASuloSICy9VCqqF+e66dEDhhzXZMY HoYTM+pze4l/iKaMt0xozFuulCIgN0f8uqqC+LGaztx/yHDII8/yIMvgGrfrvGFo+wDt bu7UxHmX6f/oEXzwi3tXTXFIiEl6Ht3dwtWgoJnmICDiED666bO6JSVkssBCgXxf9dxL a+Dm6iwwd1EjD0AqG2K1pGPa7oTTagc1t4iYm5cNJpWlNQaRGJ6KzQZ/C+iBkaHZDMla VZxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2o4auP+nFs2eMYCJbfMVDVumtxkdZ+qvS5SnuwXHOOU=; b=d7taQH1eynUkjBfpL/FsUrPJ8wW8x0YjzsZQZdaB+5AQLJlPo930fsAre38bEy++eR Z3HTagZbfOKSfVc0bIjuUVaDy7klPQ0PxfdJDjeiFod7vdmb1IEwlx2wyZP+1MroPvJM LoMF1+l/H6R/2DPbYZl//Oc90i0+ijz+bMvZHX69V1MRTm2wRFo+kcu1HSHtVhh1ujbz OtAGULxH1e5Fhzl35n4oBCniWfveo4lwX0izvGxoL+lNZuhftKPwG1BZW11Oao7RJDMU vgv6zT+SMguoEopZUjpWbU1tYNsIRi7hUQE/omJmesYCJdERWJQi8vFKysX5nPfG4fKn 68rA== X-Gm-Message-State: APjAAAUKr39mxzxlaJMwxvvmwtWxlNG2p64kfXQEC3MH4j1esZsGoLU/ kgkzTCNchyZWIUcdgSzavnLXYR6u X-Google-Smtp-Source: APXvYqyJ/HGqLN6YS34T9CAtKQX2Io+X2tFCI/hrB7UP+J+EPQMHplvX+FGH+SdQDhc6j/8IbXP3Cw== X-Received: by 2002:aed:3168:: with SMTP id 95mr9436837qtg.262.1568480968949; Sat, 14 Sep 2019 10:09:28 -0700 (PDT) Received: from casantos.casantos.org (189.27.155.121.dynamic.adsl.gvt.net.br. [189.27.155.121]) by smtp.gmail.com with ESMTPSA id i30sm10558647qte.27.2019.09.14.10.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Sep 2019 10:09:28 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 14 Sep 2019 14:09:22 -0300 Message-Id: <20190914170922.26874-1-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 Subject: [Buildroot] [PATCH] package/util-linux: revert logic regarding pam_selinux module X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Leave pam_selinux enabled by default in su.pam and remove it from the /etc/pam.d/su and /etc/pam.d/su-l files if libselinux is not selected. This prevents leaving a misleading line, even commented, referencing a PAM module that does not exist. Signed-off-by: Carlos Santos --- package/util-linux/su.pam | 4 ++-- package/util-linux/util-linux.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/util-linux/su.pam b/package/util-linux/su.pam index 84b18605ce..69b2a40c45 100644 --- a/package/util-linux/su.pam +++ b/package/util-linux/su.pam @@ -7,9 +7,9 @@ account required pam_unix.so password required pam_unix.so nullok -# session required pam_selinux.so close +session required pam_selinux.so close session required pam_limits.so session required pam_env.so session required pam_unix.so session optional pam_lastlog.so -# session required pam_selinux.so open +session required pam_selinux.so open diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index cd69838046..35f9fc16ac 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -75,14 +75,14 @@ UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS)" ifeq ($(BR2_PACKAGE_LIBSELINUX),y) UTIL_LINUX_DEPENDENCIES += libselinux UTIL_LINUX_CONF_OPTS += --with-selinux +else +UTIL_LINUX_CONF_OPTS += --without-selinux define UTIL_LINUX_SELINUX_PAMFILES_TWEAK $(foreach f,su su-l, - $(SED) 's/^# \(.*pam_selinux.so.*\)$$/\1/' \ + $(SED) '/^.*pam_selinux.so.*$$/d' \ $(TARGET_DIR)/etc/pam.d/$(f) ) endef -else -UTIL_LINUX_CONF_OPTS += --without-selinux endif # Used by cramfs utils