jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/util-linux: revert logic regarding pam_selinux module

Browse Source 
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 cosmetic change prevents leaving a misleading commented-out line
that references a PAM module that does not exist.

Signed-off-by: Carlos Santos <unixmania@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Carlos Santos 2019-09-14 14:09:22 -03:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 53622826da
commit c3aed7b0cd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/util-linux/su.pam
View File

@ -7,9 +7,9 @@ account required pam_unix.so
password required pam_unix.so nullok 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_limits.so
session required pam_env.so session required pam_env.so
session required pam_unix.so session required pam_unix.so
session optional pam_lastlog.so session optional pam_lastlog.so
# session required pam_selinux.so open session required pam_selinux.so open

6
package/util-linux/util-linux.mk
View File

@ -75,14 +75,14 @@ UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS)"
ifeq ($(BR2_PACKAGE_LIBSELINUX),y) ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
UTIL_LINUX_DEPENDENCIES += libselinux UTIL_LINUX_DEPENDENCIES += libselinux
UTIL_LINUX_CONF_OPTS += --with-selinux UTIL_LINUX_CONF_OPTS += --with-selinux
else
UTIL_LINUX_CONF_OPTS += --without-selinux
define UTIL_LINUX_SELINUX_PAMFILES_TWEAK define UTIL_LINUX_SELINUX_PAMFILES_TWEAK
$(foreach f,su su-l, $(foreach f,su su-l,
$(SED) 's/^# \(.*pam_selinux.so.*\)$$/\1/' \ $(SED) '/^.*pam_selinux.so.*$$/d' \
$(TARGET_DIR)/etc/pam.d/$(f) $(TARGET_DIR)/etc/pam.d/$(f)
) )
endef endef
else
UTIL_LINUX_CONF_OPTS += --without-selinux
endif endif
# Used by cramfs utils # Used by cramfs utils