From dc8a3b1bb16d57802d14ab2c1f85568f8ed0b618 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 3 Apr 2011 18:31:00 +0000 Subject: [package] update busybox to 1.18.4, patch from Peter Wagner git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26455 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/busybox/config/loginutils/Config.in | 100 +++++++++++++++------------- 1 file changed, 54 insertions(+), 46 deletions(-) (limited to 'package/busybox/config/loginutils') diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in index 0a7d253d7..029884062 100644 --- a/package/busybox/config/loginutils/Config.in +++ b/package/busybox/config/loginutils/Config.in @@ -5,6 +5,18 @@ menu "Login/Password Management Utilities" +config BUSYBOX_CONFIG_ADD_SHELL + bool "add-shell" + default n if BUSYBOX_CONFIG_DESKTOP + help + Add shells to /etc/shells. + +config BUSYBOX_CONFIG_REMOVE_SHELL + bool "remove-shell" + default n if BUSYBOX_CONFIG_DESKTOP + help + Remove shells from /etc/shells. + config BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS bool "Support for shadow passwords" default n @@ -91,41 +103,18 @@ config BUSYBOX_CONFIG_USE_BB_CRYPT_SHA With this option off, login will fail password check for any user which has password encrypted with these algorithms. -config BUSYBOX_CONFIG_ADDGROUP - bool "addgroup" +config BUSYBOX_CONFIG_ADDUSER + bool "adduser" default n help - Utility for creating a new group account. + Utility for creating a new user account. -config BUSYBOX_CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS +config BUSYBOX_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS bool "Enable long options" default n - depends on BUSYBOX_CONFIG_ADDGROUP && BUSYBOX_CONFIG_LONG_OPTS - help - Support long options for the addgroup applet. - -config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP - bool "Support for adding users to groups" - default n - depends on BUSYBOX_CONFIG_ADDGROUP - help - If called with two non-option arguments, - addgroup will add an existing user to an - existing group. - -config BUSYBOX_CONFIG_DELGROUP - bool "delgroup" - default n - help - Utility for deleting a group account. - -config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP - bool "Support for removing users from groups" - default n - depends on BUSYBOX_CONFIG_DELGROUP + depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_LONG_OPTS help - If called with two non-option arguments, deluser - or delgroup will remove an user from a specified group. + Support long options for the adduser applet. config BUSYBOX_CONFIG_FEATURE_CHECK_NAMES bool "Enable sanity check on user/group names in adduser and addgroup" @@ -139,19 +128,6 @@ config BUSYBOX_CONFIG_FEATURE_CHECK_NAMES For compatibility with Samba machine accounts "$" is also supported at the end of the user or group name. -config BUSYBOX_CONFIG_ADDUSER - bool "adduser" - default n - help - Utility for creating a new user account. - -config BUSYBOX_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS - bool "Enable long options" - default n - depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_LONG_OPTS - help - Support long options for the adduser applet. - config BUSYBOX_CONFIG_FIRST_SYSTEM_ID int "First valid system uid or gid for adduser and addgroup" depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP @@ -168,12 +144,48 @@ config BUSYBOX_CONFIG_LAST_SYSTEM_ID help Last valid system uid or gid for adduser and addgroup +config BUSYBOX_CONFIG_ADDGROUP + bool "addgroup" + default n + help + Utility for creating a new group account. + +config BUSYBOX_CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS + bool "Enable long options" + default n + depends on BUSYBOX_CONFIG_ADDGROUP && BUSYBOX_CONFIG_LONG_OPTS + help + Support long options for the addgroup applet. + +config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP + bool "Support for adding users to groups" + default n + depends on BUSYBOX_CONFIG_ADDGROUP + help + If called with two non-option arguments, + addgroup will add an existing user to an + existing group. + config BUSYBOX_CONFIG_DELUSER bool "deluser" default n help Utility for deleting a user account. +config BUSYBOX_CONFIG_DELGROUP + bool "delgroup" + default n + help + Utility for deleting a group account. + +config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP + bool "Support for removing users from groups" + default n + depends on BUSYBOX_CONFIG_DELGROUP + help + If called with two non-option arguments, deluser + or delgroup will remove an user from a specified group. + config BUSYBOX_CONFIG_GETTY bool "getty" default n @@ -184,7 +196,6 @@ config BUSYBOX_CONFIG_GETTY config BUSYBOX_CONFIG_LOGIN bool "login" default n - select BUSYBOX_CONFIG_FEATURE_SUID select BUSYBOX_CONFIG_FEATURE_SYSLOG help login is used when signing onto a system. @@ -227,7 +238,6 @@ config BUSYBOX_CONFIG_FEATURE_SECURETTY config BUSYBOX_CONFIG_PASSWD bool "passwd" default y - select BUSYBOX_CONFIG_FEATURE_SUID select BUSYBOX_CONFIG_FEATURE_SYSLOG help passwd changes passwords for user and group accounts. A normal user @@ -263,7 +273,6 @@ config BUSYBOX_CONFIG_CHPASSWD config BUSYBOX_CONFIG_SU bool "su" default n - select BUSYBOX_CONFIG_FEATURE_SUID select BUSYBOX_CONFIG_FEATURE_SYSLOG help su is used to become another user during a login session. @@ -293,7 +302,6 @@ config BUSYBOX_CONFIG_SULOGIN config BUSYBOX_CONFIG_VLOCK bool "vlock" default n - select BUSYBOX_CONFIG_FEATURE_SUID help Build the "vlock" applet which allows you to lock (virtual) terminals. -- cgit v1.2.3