[Buildroot] [PATCH] package/util-linux: revert logic regarding pam_selinux module

[Arnout Vandecappelle <arnout@mind.be>]

On 14/09/2019 19:09, unixmania at gmail.com wrote:
> From: Carlos Santos <unixmania@gmail.com>
> 
> 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.

 I've slightly reworded this and committed to master, thanks.

 Regards,
 Arnout

> 
> Signed-off-by: Carlos Santos <unixmania@gmail.com>
> ---
>  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
>