Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge

Conflicts:
	include/platform.h
	libbb/Kbuild.src
	libbb/messages.c

1 files changed, 0 insertions, 4 deletions

diff --git a/loginutils/Config.src b/loginutils/Config.src
index 8158bce74..4c771bbc4 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
@@ -186,7 +186,6 @@ config GETTY
 config LOGIN
         bool "login"
         default y
-        select FEATURE_SUID
         select FEATURE_SYSLOG
         help
           login is used when signing onto a system.
@@ -229,7 +228,6 @@ config FEATURE_SECURETTY
 config PASSWD
         bool "passwd"
         default y
-        select FEATURE_SUID
         select FEATURE_SYSLOG
         help
           passwd changes passwords for user and group accounts. A normal user
@@ -265,7 +263,6 @@ config CHPASSWD
 config SU
         bool "su"
         default y
-        select FEATURE_SUID
         select FEATURE_SYSLOG
         help
           su is used to become another user during a login session.
@@ -295,7 +292,6 @@ config SULOGIN
 config VLOCK
         bool "vlock"
         default y
-        select FEATURE_SUID
         help
           Build the "vlock" applet which allows you to lock (virtual) terminals.