The login applet should always be setuid root

[oweals/busybox.git] / include / applets.h

diff --git a/include/applets.h b/include/applets.h
index f3b5f3d1c7c2fe2b487c1b81f02de20450463e34..90d4195cce7d6a1d5cc9a25f149e22ae5651d32e 100644 (file)
--- a/include/applets.h
+++ b/include/applets.h
@@ -292,7 +292,7 @@
 #ifdef CONFIG_IP
        APPLET(ip, ip_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_IPADDRESS
+#ifdef CONFIG_IPADDR
        APPLET(ipaddr, ipaddr_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_IPCALC
@@ -341,7 +341,7 @@
        APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_LOGIN
-       APPLET(login, login_main, _BB_DIR_BIN, _BB_SUID_NEVER)
+       APPLET(login, login_main, _BB_DIR_BIN, _BB_SUID_ALWAYS)
 #endif
 #ifdef CONFIG_LOGNAME
        APPLET(logname, logname_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
@@ -367,9 +367,6 @@
 #ifdef CONFIG_MESG
        APPLET(mesg, mesg_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_MINIT
-       APPLET(minit, minit_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
-#endif
 #ifdef CONFIG_MKDIR
        APPLET(mkdir, mkdir_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
@@ -400,9 +397,6 @@
 #ifdef CONFIG_MSH
        APPLET_NOUSAGE("msh", msh_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_MSVC
-       APPLET(msvc, msvc_main, _BB_DIR_BIN, _BB_SUID_NEVER)
-#endif
 #ifdef CONFIG_MT
        APPLET(mt, mt_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
@@ -433,9 +427,6 @@
 #ifdef CONFIG_PATCH
        APPLET(patch, patch_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
-#ifdef CONFIG_PIDFILEHACK
-       APPLET(pidfilehack, pidfilehack_main, _BB_DIR_BIN, _BB_SUID_NEVER)
-#endif
 #ifdef CONFIG_PIDOF
        APPLET(pidof, pidof_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
@@ -501,7 +492,7 @@
 #endif
 #ifdef CONFIG_RUN_PARTS
        APPLET_ODDNAME("run-parts", run_parts_main, _BB_DIR_BIN, _BB_SUID_NEVER, run_parts)
-#endif 
+#endif
 #ifdef CONFIG_RX
        APPLET(rx, rx_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif