[target/generic]: preliminary 2.6.38 support

[openwrt.git] / package / busybox / config / loginutils / Config.in

diff --git a/package/busybox/config/loginutils/Config.in b/package/busybox/config/loginutils/Config.in
index fa9f65e..0a7d253 100644 (file)
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -58,7 +58,7 @@ config BUSYBOX_CONFIG_USE_BB_SHADOW
          password servers and whatnot.
 
 config BUSYBOX_CONFIG_USE_BB_CRYPT
-       bool "Use internal DES and MD5 crypt functions"
+       bool "Use internal crypt functions"
        default n
        help
          Busybox has internal DES and MD5 crypt functions.
@@ -79,12 +79,31 @@ config BUSYBOX_CONFIG_USE_BB_CRYPT
          In static build, it makes code _smaller_ by about 1.2k,
          and likely many kilobytes less of bss.
 
+config BUSYBOX_CONFIG_USE_BB_CRYPT_SHA
+       bool "Enable SHA256/512 crypt functions"
+       default n
+       depends on BUSYBOX_CONFIG_USE_BB_CRYPT
+       help
+         Enable this if you have passwords starting with "$5$" or "$6$"
+         in your /etc/passwd or /etc/shadow files. These passwords
+         are hashed using SHA256 and SHA512 algorithms. Support for them
+         was added to glibc in 2008.
+         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"
        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
@@ -129,10 +148,26 @@ config BUSYBOX_CONFIG_ADDUSER
 config BUSYBOX_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS
        bool "Enable long options"
        default n
-       depends on BUSYBOX_CONFIG_ADDUSER && BUSYBOX_CONFIG_GETOPT_LONG
+       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
+       range 0 64900
+       default 100
+       help
+         First valid system uid or gid for adduser and addgroup
+
+config BUSYBOX_CONFIG_LAST_SYSTEM_ID
+       int "Last valid system uid or gid for adduser and addgroup"
+       depends on BUSYBOX_CONFIG_ADDUSER || BUSYBOX_CONFIG_ADDGROUP
+       range 0 64900
+       default 999
+       help
+         Last valid system uid or gid for adduser and addgroup
+
 config BUSYBOX_CONFIG_DELUSER
        bool "deluser"
        default n
@@ -146,22 +181,6 @@ config BUSYBOX_CONFIG_GETTY
        help
          getty lets you log in on a tty, it is normally invoked by init.
 
-config BUSYBOX_CONFIG_FEATURE_UTMP
-       bool "Support utmp file"
-       depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_WHO
-       default n
-       help
-         The file /var/run/utmp is used to track who is currently logged in.
-
-config BUSYBOX_CONFIG_FEATURE_WTMP
-       bool "Support wtmp file"
-       depends on BUSYBOX_CONFIG_GETTY || BUSYBOX_CONFIG_LOGIN || BUSYBOX_CONFIG_SU || BUSYBOX_CONFIG_LAST
-       default n
-       select BUSYBOX_CONFIG_FEATURE_UTMP
-       help
-         The file /var/run/wtmp is used to track when user's have logged into
-         and logged out of the system.
-
 config BUSYBOX_CONFIG_LOGIN
        bool "login"
        default n
@@ -230,15 +249,16 @@ config BUSYBOX_CONFIG_CRYPTPW
        bool "cryptpw"
        default n
        help
-         Applet for crypting a string.
+         Encrypts the given password with the crypt(3) libc function
+         using the given salt. Debian has this utility under mkpasswd
+         name. Busybox provides mkpasswd as an alias for cryptpw.
 
 config BUSYBOX_CONFIG_CHPASSWD
-       bool "chpasswd"
-       default n
-       help
-         chpasswd  reads  a  file  of user name and password pairs from
-         standard input and uses this information to update a group of
-         existing users.
+       bool "chpasswd"
+       default n
+       help
+         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_CONFIG_SU
        bool "su"