[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 a0f1ca9..0a7d253 100644 (file)
--- a/package/busybox/config/loginutils/Config.in
+++ b/package/busybox/config/loginutils/Config.in
@@ -9,7 +9,7 @@ config BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS
        bool "Support for shadow passwords"
        default n
        help
        bool "Support for shadow passwords"
        default n
        help

-         Build support for shadow password in /etc/shadow.  This file is only
+         Build support for shadow password in /etc/shadow. This file is only

          readable by root and thus the encrypted passwords are no longer
          publicly readable.
 
          readable by root and thus the encrypted passwords are no longer
          publicly readable.
 


@@ -18,17 +18,17 @@ config BUSYBOX_CONFIG_USE_BB_PWD_GRP
        default n
        help
          If you leave this disabled, busybox will use the system's password
        default n
        help
          If you leave this disabled, busybox will use the system's password

-         and group functions.  And if you are using the GNU C library
+         and group functions. And if you are using the GNU C library

          (glibc), you will then need to install the /etc/nsswitch.conf
          configuration file and the required /lib/libnss_* libraries in
          (glibc), you will then need to install the /etc/nsswitch.conf
          configuration file and the required /lib/libnss_* libraries in

-         order for the password and group functions to work.  This generally
+         order for the password and group functions to work. This generally

          makes your embedded system quite a bit larger.
 
          Enabling this option will cause busybox to directly access the
          system's /etc/password, /etc/group files (and your system will be
          smaller, and I will get fewer emails asking about how glibc NSS
          makes your embedded system quite a bit larger.
 
          Enabling this option will cause busybox to directly access the
          system's /etc/password, /etc/group files (and your system will be
          smaller, and I will get fewer emails asking about how glibc NSS

-         works).  When this option is enabled, you will not be able to use
-         PAM to access remote LDAP password servers and whatnot.  And if you
+         works). When this option is enabled, you will not be able to use
+         PAM to access remote LDAP password servers and whatnot. And if you

          want hostname resolution to work with glibc, you still need the
          /lib/libnss_* libraries.
 
          want hostname resolution to work with glibc, you still need the
          /lib/libnss_* libraries.
 


@@ -44,21 +44,21 @@ config BUSYBOX_CONFIG_USE_BB_SHADOW
        depends on BUSYBOX_CONFIG_USE_BB_PWD_GRP && BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS
        help
          If you leave this disabled, busybox will use the system's shadow
        depends on BUSYBOX_CONFIG_USE_BB_PWD_GRP && BUSYBOX_CONFIG_FEATURE_SHADOWPASSWDS
        help
          If you leave this disabled, busybox will use the system's shadow

-         password handling functions.  And if you are using the GNU C library
+         password handling functions. And if you are using the GNU C library

          (glibc), you will then need to install the /etc/nsswitch.conf
          configuration file and the required /lib/libnss_* libraries in
          (glibc), you will then need to install the /etc/nsswitch.conf
          configuration file and the required /lib/libnss_* libraries in

-         order for the shadow password functions to work.  This generally
+         order for the shadow password functions to work. This generally

          makes your embedded system quite a bit larger.
 
          Enabling this option will cause busybox to directly access the
          makes your embedded system quite a bit larger.
 
          Enabling this option will cause busybox to directly access the

-         system's /etc/shadow file when handling shadow passwords.  This
+         system's /etc/shadow file when handling shadow passwords. This

          makes your system smaller (and I will get fewer emails asking about
          makes your system smaller (and I will get fewer emails asking about

-         how glibc NSS works).  When this option is enabled, you will not be
+         how glibc NSS works). When this option is enabled, you will not be

          able to use PAM to access shadow passwords from remote LDAP
          password servers and whatnot.
 
 config BUSYBOX_CONFIG_USE_BB_CRYPT
          able to use PAM to access shadow passwords from remote LDAP
          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.
        default n
        help
          Busybox has internal DES and MD5 crypt functions.


@@ -66,7 +66,7 @@ config BUSYBOX_CONFIG_USE_BB_CRYPT
          standard C library functions.
 
          If you leave this disabled, busybox will use the system's
          standard C library functions.
 
          If you leave this disabled, busybox will use the system's

-         crypt functions.  Most C libraries use large (~70k)
+         crypt functions. Most C libraries use large (~70k)

          static buffers there, and also combine them with more general
          DES encryption/decryption.
 
          static buffers there, and also combine them with more general
          DES encryption/decryption.
 


@@ -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.
 
          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_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
 config BUSYBOX_CONFIG_FEATURE_ADDUSER_TO_GROUP
        bool "Support for adding users to groups"
        default n


@@ -101,7 +120,7 @@ config BUSYBOX_CONFIG_DELGROUP
          Utility for deleting a group account.
 
 config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP
          Utility for deleting a group account.
 
 config BUSYBOX_CONFIG_FEATURE_DEL_USER_FROM_GROUP

-       bool "Support for removing users from groups."
+       bool "Support for removing users from groups"

        default n
        depends on BUSYBOX_CONFIG_DELGROUP
        help
        default n
        depends on BUSYBOX_CONFIG_DELGROUP
        help


@@ -129,10 +148,26 @@ config BUSYBOX_CONFIG_ADDUSER
 config BUSYBOX_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS
        bool "Enable long options"
        default n
 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.
 
        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
 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.
 
        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
 config BUSYBOX_CONFIG_LOGIN
        bool "login"
        default n


@@ -211,9 +230,9 @@ config BUSYBOX_CONFIG_PASSWD
        select BUSYBOX_CONFIG_FEATURE_SUID
        select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help
        select BUSYBOX_CONFIG_FEATURE_SUID
        select BUSYBOX_CONFIG_FEATURE_SYSLOG
        help

-         passwd changes passwords for user and group accounts.  A normal user
+         passwd changes passwords for user and group accounts. A normal user

          may only change the password for his/her own account, the super user
          may only change the password for his/her own account, the super user

-         may change the password for any account.  The administrator of a group
+         may change the password for any account. The administrator of a group

          may change the password for the group.
 
          Note that Busybox binary must be setuid root for this applet to
          may change the password for the group.
 
          Note that Busybox binary must be setuid root for this applet to


@@ -230,15 +249,16 @@ config BUSYBOX_CONFIG_CRYPTPW
        bool "cryptpw"
        default n
        help
        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
 
 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"
 
 config BUSYBOX_CONFIG_SU
        bool "su"