From 46b42b19c7dec20400c1c7621d09277bf3d92874 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 30 Aug 2012 10:20:41 +0200 Subject: update busybox to latest stable version, refresh all Config.in files --- package/busybox/config/loginutils/Config.in | 142 +++++++++++++++------------- 1 file changed, 77 insertions(+), 65 deletions(-) (limited to 'package/busybox/config/loginutils/Config.in') diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in index ab0e578d8..1c36631f9 100644 --- a/package/busybox/config/loginutils/Config.in +++ b/package/busybox/config/loginutils/Config.in @@ -1,3 +1,4 @@ +# DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, # see scripts/kbuild/config-language.txt. @@ -7,13 +8,13 @@ menu "Login/Password Management Utilities" config BUSYBOX_ADD_SHELL bool "add-shell" - default y if BUSYBOX_DESKTOP + default y if DESKTOP help Add shells to /etc/shells. config BUSYBOX_REMOVE_SHELL bool "remove-shell" - default y if BUSYBOX_DESKTOP + default y if DESKTOP help Remove shells from /etc/shells. @@ -93,7 +94,7 @@ config BUSYBOX_USE_BB_CRYPT config BUSYBOX_USE_BB_CRYPT_SHA bool "Enable SHA256/512 crypt functions" - default n + default y depends on BUSYBOX_USE_BB_CRYPT help Enable this if you have passwords starting with "$5$" or "$6$" @@ -103,41 +104,18 @@ config BUSYBOX_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_ADDGROUP - bool "addgroup" +config BUSYBOX_ADDUSER + bool "adduser" default y help - Utility for creating a new group account. + Utility for creating a new user account. -config BUSYBOX_FEATURE_ADDGROUP_LONG_OPTIONS +config BUSYBOX_FEATURE_ADDUSER_LONG_OPTIONS bool "Enable long options" - default n - depends on BUSYBOX_ADDGROUP && BUSYBOX_LONG_OPTS - help - Support long options for the addgroup applet. - -config BUSYBOX_FEATURE_ADDUSER_TO_GROUP - bool "Support for adding users to groups" - default n - depends on BUSYBOX_ADDGROUP - help - If called with two non-option arguments, - addgroup will add an existing user to an - existing group. - -config BUSYBOX_DELGROUP - bool "delgroup" default y + depends on BUSYBOX_ADDUSER && BUSYBOX_LONG_OPTS help - Utility for deleting a group account. - -config BUSYBOX_FEATURE_DEL_USER_FROM_GROUP - bool "Support for removing users from groups" - default n - depends on BUSYBOX_DELGROUP - 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_FEATURE_CHECK_NAMES bool "Enable sanity check on user/group names in adduser and addgroup" @@ -151,19 +129,6 @@ config BUSYBOX_FEATURE_CHECK_NAMES For compatibility with Samba machine accounts "$" is also supported at the end of the user or group name. -config BUSYBOX_ADDUSER - bool "adduser" - default y - help - Utility for creating a new user account. - -config BUSYBOX_FEATURE_ADDUSER_LONG_OPTIONS - bool "Enable long options" - default n - depends on BUSYBOX_ADDUSER && BUSYBOX_LONG_OPTS - help - Support long options for the adduser applet. - config BUSYBOX_FIRST_SYSTEM_ID int "First valid system uid or gid for adduser and addgroup" depends on BUSYBOX_ADDUSER || BUSYBOX_ADDGROUP @@ -180,39 +145,70 @@ config BUSYBOX_LAST_SYSTEM_ID help Last valid system uid or gid for adduser and addgroup +config BUSYBOX_ADDGROUP + bool "addgroup" + default y + help + Utility for creating a new group account. + +config BUSYBOX_FEATURE_ADDGROUP_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_ADDGROUP && BUSYBOX_LONG_OPTS + help + Support long options for the addgroup applet. + +config BUSYBOX_FEATURE_ADDUSER_TO_GROUP + bool "Support for adding users to groups" + default y + depends on BUSYBOX_ADDGROUP + help + If called with two non-option arguments, + addgroup will add an existing user to an + existing group. + config BUSYBOX_DELUSER bool "deluser" default y help Utility for deleting a user account. +config BUSYBOX_DELGROUP + bool "delgroup" + default y + help + Utility for deleting a group account. + +config BUSYBOX_FEATURE_DEL_USER_FROM_GROUP + bool "Support for removing users from groups" + default y + depends on BUSYBOX_DELGROUP + help + If called with two non-option arguments, deluser + or delgroup will remove an user from a specified group. + config BUSYBOX_GETTY bool "getty" default y select BUSYBOX_FEATURE_SYSLOG help - getty lets you log in on a tty, it is normally invoked by init. + getty lets you log in on a tty. It is normally invoked by init. -config BUSYBOX_FEATURE_UTMP - bool "Support utmp file" - depends on BUSYBOX_GETTY || BUSYBOX_LOGIN || BUSYBOX_SU || BUSYBOX_WHO - default n - help - The file /var/run/utmp is used to track who is currently logged in. + Note that you can save a few bytes by disabling it and + using login applet directly. + If you need to reset tty attributes before calling login, + this script approximates getty: -config BUSYBOX_FEATURE_WTMP - bool "Support wtmp file" - depends on BUSYBOX_GETTY || BUSYBOX_LOGIN || BUSYBOX_SU || BUSYBOX_LAST - default n - select BUSYBOX_FEATURE_UTMP - help - The file /var/run/wtmp is used to track when user's have logged into - and logged out of the system. + exec /dev/$1 2>&1 || BUSYBOX_exit 1 + reset + stty sane; stty ispeed 38400; stty ospeed 38400 + printf "%s login: " "`hostname`" + read -r login + exec /bin/login "$login" config BUSYBOX_LOGIN bool "login" default y - select BUSYBOX_FEATURE_SUID select BUSYBOX_FEATURE_SYSLOG help login is used when signing onto a system. @@ -220,8 +216,20 @@ config BUSYBOX_LOGIN Note that Busybox binary must be setuid root for this applet to work properly. +config BUSYBOX_LOGIN_SESSION_AS_CHILD + bool "Run logged in session in a child process" + default y if PAM + depends on BUSYBOX_LOGIN + help + Run the logged in session in a child process. This allows + login to clean up things such as utmp entries or PAM sessions + when the login session is complete. If you use PAM, you + almost always would want this to be set to Y, else PAM session + will not be cleaned up. + config BUSYBOX_PAM bool "Support for PAM (Pluggable Authentication Modules)" + depends on !ADK_PACKAGE_PAM default n depends on BUSYBOX_LOGIN help @@ -245,7 +253,7 @@ config BUSYBOX_FEATURE_NOLOGIN config BUSYBOX_FEATURE_SECURETTY bool "Support for /etc/securetty" - default y + default n depends on BUSYBOX_LOGIN help The file /etc/securetty is used by (some versions of) login(1). @@ -255,7 +263,6 @@ config BUSYBOX_FEATURE_SECURETTY config BUSYBOX_PASSWD bool "passwd" default y - select BUSYBOX_FEATURE_SUID select BUSYBOX_FEATURE_SYSLOG help passwd changes passwords for user and group accounts. A normal user @@ -288,10 +295,16 @@ config BUSYBOX_CHPASSWD Reads a file of user name and password pairs from standard input and uses this information to update a group of existing users. +config BUSYBOX_FEATURE_DEFAULT_PASSWD_ALGO + string "Default password encryption method (passwd -a, cryptpw -m parameter)" + default "des" + depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW + help + Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512". + config BUSYBOX_SU bool "su" default y - select BUSYBOX_FEATURE_SUID select BUSYBOX_FEATURE_SYSLOG help su is used to become another user during a login session. @@ -321,7 +334,6 @@ config BUSYBOX_SULOGIN config BUSYBOX_VLOCK bool "vlock" default n - select BUSYBOX_FEATURE_SUID help Build the "vlock" applet which allows you to lock (virtual) terminals. -- cgit v1.2.3