diff options
Diffstat (limited to 'loginutils')
| -rw-r--r-- | loginutils/Config.src | 104 | ||||
| -rw-r--r-- | loginutils/add-remove-shell.c | 16 | ||||
| -rw-r--r-- | loginutils/addgroup.c | 8 | ||||
| -rw-r--r-- | loginutils/adduser.c | 20 | ||||
| -rw-r--r-- | loginutils/chpasswd.c | 6 | ||||
| -rw-r--r-- | loginutils/cryptpw.c | 10 | ||||
| -rw-r--r-- | loginutils/deluser.c | 8 | ||||
| -rw-r--r-- | loginutils/getty.c | 22 | ||||
| -rw-r--r-- | loginutils/login.c | 30 | ||||
| -rw-r--r-- | loginutils/passwd.c | 14 | ||||
| -rw-r--r-- | loginutils/su.c | 8 | ||||
| -rw-r--r-- | loginutils/sulogin.c | 4 | ||||
| -rw-r--r-- | loginutils/vlock.c | 6 |
13 files changed, 128 insertions, 128 deletions
diff --git a/loginutils/Config.src b/loginutils/Config.src index beb4eb855..680f42118 100644 --- a/loginutils/Config.src +++ b/loginutils/Config.src @@ -9,87 +9,87 @@ config FEATURE_SHADOWPASSWDS bool "Support shadow passwords" default y help - 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. + 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. config USE_BB_PWD_GRP bool "Use internal password and group functions rather than system functions" default y 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 - (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 - makes your embedded system quite a bit larger. + If you leave this disabled, busybox will use the system's password + 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 + 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 - 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. + 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 + want hostname resolution to work with glibc, you still need the + /lib/libnss_* libraries. - If you need to use glibc's nsswitch.conf mechanism - (e.g. if user/group database is NOT stored in /etc/passwd etc), - you must NOT use this option. + If you need to use glibc's nsswitch.conf mechanism + (e.g. if user/group database is NOT stored in /etc/passwd etc), + you must NOT use this option. - If you enable this option, it will add about 1.5k. + If you enable this option, it will add about 1.5k. config USE_BB_SHADOW bool "Use internal shadow password functions" default y depends on USE_BB_PWD_GRP && 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 - (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 - makes your embedded system quite a bit larger. + If you leave this disabled, busybox will use the system's shadow + 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 + 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 - system's /etc/shadow file when handling shadow passwords. This - 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 - able to use PAM to access shadow passwords from remote LDAP - password servers and whatnot. + Enabling this option will cause busybox to directly access the + system's /etc/shadow file when handling shadow passwords. This + 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 + able to use PAM to access shadow passwords from remote LDAP + password servers and whatnot. config USE_BB_CRYPT bool "Use internal crypt functions" default y help - Busybox has internal DES and MD5 crypt functions. - They produce results which are identical to corresponding - standard C library functions. + Busybox has internal DES and MD5 crypt functions. + They produce results which are identical to corresponding + standard C library functions. - If you leave this disabled, busybox will use the system's - crypt functions. Most C libraries use large (~70k) - static buffers there, and also combine them with more general - DES encryption/decryption. + If you leave this disabled, busybox will use the system's + crypt functions. Most C libraries use large (~70k) + static buffers there, and also combine them with more general + DES encryption/decryption. - For busybox, having large static buffers is undesirable, - especially on NOMMU machines. Busybox also doesn't need - DES encryption/decryption and can do with smaller code. + For busybox, having large static buffers is undesirable, + especially on NOMMU machines. Busybox also doesn't need + DES encryption/decryption and can do with smaller code. - If you enable this option, it will add about 4.8k of code - if you are building dynamically linked executable. - In static build, it makes code _smaller_ by about 1.2k, - and likely many kilobytes less of bss. + If you enable this option, it will add about 4.8k of code + if you are building dynamically linked executable. + In static build, it makes code _smaller_ by about 1.2k, + and likely many kilobytes less of bss. config USE_BB_CRYPT_SHA bool "Enable SHA256/512 crypt functions" default y depends on 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. + 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. INSERT diff --git a/loginutils/add-remove-shell.c b/loginutils/add-remove-shell.c index eb16c6ead..750b44bd6 100644 --- a/loginutils/add-remove-shell.c +++ b/loginutils/add-remove-shell.c @@ -8,16 +8,16 @@ * for details. */ //config:config ADD_SHELL -//config: bool "add-shell (2.8 kb)" -//config: default y if DESKTOP -//config: help -//config: Add shells to /etc/shells. +//config: bool "add-shell (2.8 kb)" +//config: default y if DESKTOP +//config: help +//config: Add shells to /etc/shells. //config: //config:config REMOVE_SHELL -//config: bool "remove-shell (2.7 kb)" -//config: default y if DESKTOP -//config: help -//config: Remove shells from /etc/shells. +//config: bool "remove-shell (2.7 kb)" +//config: default y if DESKTOP +//config: help +//config: Remove shells from /etc/shells. // APPLET_ODDNAME:name main location suid_type help //applet:IF_ADD_SHELL( APPLET_ODDNAME(add-shell , add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, add_shell )) diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c index c02ff10e9..b197fc149 100644 --- a/loginutils/addgroup.c +++ b/loginutils/addgroup.c @@ -13,7 +13,7 @@ //config: bool "addgroup (8.2 kb)" //config: default y //config: help -//config: Utility for creating a new group account. +//config: Utility for creating a new group account. //config: //config:config FEATURE_ADDGROUP_LONG_OPTIONS //config: bool "Enable long options" @@ -25,9 +25,9 @@ //config: default y //config: depends on ADDGROUP //config: help -//config: If called with two non-option arguments, -//config: addgroup will add an existing user to an -//config: existing group. +//config: If called with two non-option arguments, +//config: addgroup will add an existing user to an +//config: existing group. //applet:IF_ADDGROUP(APPLET(addgroup, BB_DIR_USR_SBIN, BB_SUID_DROP)) diff --git a/loginutils/adduser.c b/loginutils/adduser.c index e2818f852..ef18278ac 100644 --- a/loginutils/adduser.c +++ b/loginutils/adduser.c @@ -11,7 +11,7 @@ //config: bool "adduser (15 kb)" //config: default y //config: help -//config: Utility for creating a new user account. +//config: Utility for creating a new user account. //config: //config:config FEATURE_ADDUSER_LONG_OPTIONS //config: bool "Enable long options" @@ -23,19 +23,19 @@ //config: default n //config: depends on ADDUSER || ADDGROUP //config: help -//config: Enable sanity check on user and group names in adduser and addgroup. -//config: To avoid problems, the user or group name should consist only of -//config: letters, digits, underscores, periods, at signs and dashes, -//config: and not start with a dash (as defined by IEEE Std 1003.1-2001). -//config: For compatibility with Samba machine accounts "$" is also supported -//config: at the end of the user or group name. +//config: Enable sanity check on user and group names in adduser and addgroup. +//config: To avoid problems, the user or group name should consist only of +//config: letters, digits, underscores, periods, at signs and dashes, +//config: and not start with a dash (as defined by IEEE Std 1003.1-2001). +//config: For compatibility with Samba machine accounts "$" is also supported +//config: at the end of the user or group name. //config: //config:config LAST_ID //config: int "Last valid uid or gid for adduser and addgroup" //config: depends on ADDUSER || ADDGROUP //config: default 60000 //config: help -//config: Last valid uid or gid for adduser and addgroup +//config: Last valid uid or gid for adduser and addgroup //config: //config:config FIRST_SYSTEM_ID //config: int "First valid system uid or gid for adduser and addgroup" @@ -43,7 +43,7 @@ //config: range 0 LAST_ID //config: default 100 //config: help -//config: First valid system uid or gid for adduser and addgroup +//config: First valid system uid or gid for adduser and addgroup //config: //config:config LAST_SYSTEM_ID //config: int "Last valid system uid or gid for adduser and addgroup" @@ -51,7 +51,7 @@ //config: range FIRST_SYSTEM_ID LAST_ID //config: default 999 //config: help -//config: Last valid system uid or gid for adduser and addgroup +//config: Last valid system uid or gid for adduser and addgroup //applet:IF_ADDUSER(APPLET(adduser, BB_DIR_USR_SBIN, BB_SUID_DROP)) diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c index 60f54ab01..e390da647 100644 --- a/loginutils/chpasswd.c +++ b/loginutils/chpasswd.c @@ -9,15 +9,15 @@ //config: bool "chpasswd (18 kb)" //config: default y //config: help -//config: Reads a file of user name and password pairs from standard input -//config: and uses this information to update a group of existing users. +//config: Reads a file of user name and password pairs from standard input +//config: and uses this information to update a group of existing users. //config: //config:config FEATURE_DEFAULT_PASSWD_ALGO //config: string "Default encryption method (passwd -a, cryptpw -m, chpasswd -c ALG)" //config: default "des" //config: depends on PASSWD || CRYPTPW || CHPASSWD //config: help -//config: Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512". +//config: Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512". //applet:IF_CHPASSWD(APPLET(chpasswd, BB_DIR_USR_SBIN, BB_SUID_DROP)) diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index 75769c813..f8906c59a 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c @@ -13,16 +13,16 @@ //config: bool "cryptpw (14 kb)" //config: default y //config: help -//config: Encrypts the given password with the crypt(3) libc function -//config: using the given salt. +//config: Encrypts the given password with the crypt(3) libc function +//config: using the given salt. //config: //config:config MKPASSWD //config: bool "mkpasswd (15 kb)" //config: default y //config: help -//config: Encrypts the given password with the crypt(3) libc function -//config: using the given salt. Debian has this utility under mkpasswd -//config: name. Busybox provides mkpasswd as an alias for cryptpw. +//config: Encrypts the given password with the crypt(3) libc function +//config: using the given salt. Debian has this utility under mkpasswd +//config: name. Busybox provides mkpasswd as an alias for cryptpw. //applet:IF_CRYPTPW(APPLET(cryptpw, BB_DIR_USR_BIN, BB_SUID_DROP)) // APPLET_ODDNAME:name main location suid_type help diff --git a/loginutils/deluser.c b/loginutils/deluser.c index 5b05faf3a..3b6bd952d 100644 --- a/loginutils/deluser.c +++ b/loginutils/deluser.c @@ -12,21 +12,21 @@ //config: bool "deluser (8.4 kb)" //config: default y //config: help -//config: Utility for deleting a user account. +//config: Utility for deleting a user account. //config: //config:config DELGROUP //config: bool "delgroup (5.6 kb)" //config: default y //config: help -//config: Utility for deleting a group account. +//config: Utility for deleting a group account. //config: //config:config FEATURE_DEL_USER_FROM_GROUP //config: bool "Support removing users from groups" //config: default y //config: depends on DELGROUP //config: help -//config: If called with two non-option arguments, deluser -//config: or delgroup will remove an user from a specified group. +//config: If called with two non-option arguments, deluser +//config: or delgroup will remove an user from a specified group. //applet:IF_DELUSER(APPLET(deluser, BB_DIR_USR_SBIN, BB_SUID_DROP)) //applet:IF_DELGROUP(APPLET_ODDNAME(delgroup, deluser, BB_DIR_USR_SBIN, BB_SUID_DROP, delgroup)) diff --git a/loginutils/getty.c b/loginutils/getty.c index d38471a42..fd5116d08 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c @@ -26,19 +26,19 @@ //config: default y //config: select FEATURE_SYSLOG //config: help -//config: getty lets you log in on a tty. It is normally invoked by init. +//config: getty lets you log in on a tty. It is normally invoked by init. //config: -//config: Note that you can save a few bytes by disabling it and -//config: using login applet directly. -//config: If you need to reset tty attributes before calling login, -//config: this script approximates getty: +//config: Note that you can save a few bytes by disabling it and +//config: using login applet directly. +//config: If you need to reset tty attributes before calling login, +//config: this script approximates getty: //config: -//config: exec </dev/$1 >/dev/$1 2>&1 || exit 1 -//config: reset -//config: stty sane; stty ispeed 38400; stty ospeed 38400 -//config: printf "%s login: " "`hostname`" -//config: read -r login -//config: exec /bin/login "$login" +//config: exec </dev/$1 >/dev/$1 2>&1 || exit 1 +//config: reset +//config: stty sane; stty ispeed 38400; stty ospeed 38400 +//config: printf "%s login: " "`hostname`" +//config: read -r login +//config: exec /bin/login "$login" //applet:IF_GETTY(APPLET(getty, BB_DIR_SBIN, BB_SUID_DROP)) diff --git a/loginutils/login.c b/loginutils/login.c index fbdfd2925..39f703f07 100644 --- a/loginutils/login.c +++ b/loginutils/login.c @@ -7,46 +7,46 @@ //config: default y //config: select FEATURE_SYSLOG //config: help -//config: login is used when signing onto a system. +//config: login is used when signing onto a system. //config: -//config: Note that Busybox binary must be setuid root for this applet to -//config: work properly. +//config: Note that Busybox binary must be setuid root for this applet to +//config: work properly. //config: //config:config LOGIN_SESSION_AS_CHILD //config: bool "Run logged in session in a child process" //config: default y if PAM //config: depends on LOGIN //config: help -//config: Run the logged in session in a child process. This allows -//config: login to clean up things such as utmp entries or PAM sessions -//config: when the login session is complete. If you use PAM, you -//config: almost always would want this to be set to Y, else PAM session -//config: will not be cleaned up. +//config: Run the logged in session in a child process. This allows +//config: login to clean up things such as utmp entries or PAM sessions +//config: when the login session is complete. If you use PAM, you +//config: almost always would want this to be set to Y, else PAM session +//config: will not be cleaned up. //config: //config:config LOGIN_SCRIPTS //config: bool "Support login scripts" //config: depends on LOGIN //config: default y //config: help -//config: Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT -//config: just prior to switching from root to logged-in user. +//config: Enable this if you want login to execute $LOGIN_PRE_SUID_SCRIPT +//config: just prior to switching from root to logged-in user. //config: //config:config FEATURE_NOLOGIN //config: bool "Support /etc/nologin" //config: default y //config: depends on LOGIN //config: help -//config: The file /etc/nologin is used by (some versions of) login(1). -//config: If it exists, non-root logins are prohibited. +//config: The file /etc/nologin is used by (some versions of) login(1). +//config: If it exists, non-root logins are prohibited. //config: //config:config FEATURE_SECURETTY //config: bool "Support /etc/securetty" //config: default y //config: depends on LOGIN //config: help -//config: The file /etc/securetty is used by (some versions of) login(1). -//config: The file contains the device names of tty lines (one per line, -//config: without leading /dev/) on which root is allowed to login. +//config: The file /etc/securetty is used by (some versions of) login(1). +//config: The file contains the device names of tty lines (one per line, +//config: without leading /dev/) on which root is allowed to login. //applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */ //applet:IF_LOGIN(APPLET(login, BB_DIR_BIN, BB_SUID_REQUIRE)) diff --git a/loginutils/passwd.c b/loginutils/passwd.c index ea8f07474..03f8ad0a4 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c @@ -7,20 +7,20 @@ //config: default y //config: select FEATURE_SYSLOG //config: help -//config: passwd changes passwords for user and group accounts. A normal user -//config: may only change the password for his/her own account, the super user -//config: may change the password for any account. The administrator of a group -//config: may change the password for the group. +//config: passwd changes passwords for user and group accounts. A normal user +//config: may only change the password for his/her own account, the super user +//config: may change the password for any account. The administrator of a group +//config: may change the password for the group. //config: -//config: Note that Busybox binary must be setuid root for this applet to -//config: work properly. +//config: Note that Busybox binary must be setuid root for this applet to +//config: work properly. //config: //config:config FEATURE_PASSWD_WEAK_CHECK //config: bool "Check new passwords for weakness" //config: default y //config: depends on PASSWD //config: help -//config: With this option passwd will refuse new passwords which are "weak". +//config: With this option passwd will refuse new passwords which are "weak". //applet:/* Needs to be run by root or be suid root - needs to change /etc/{passwd,shadow}: */ //applet:IF_PASSWD(APPLET(passwd, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) diff --git a/loginutils/su.c b/loginutils/su.c index b70696fe7..41291ea8f 100644 --- a/loginutils/su.c +++ b/loginutils/su.c @@ -9,10 +9,10 @@ //config: default y //config: select FEATURE_SYSLOG //config: help -//config: su is used to become another user during a login session. -//config: Invoked without a username, su defaults to becoming the super user. -//config: Note that busybox binary must be setuid root for this applet to -//config: work properly. +//config: su is used to become another user during a login session. +//config: Invoked without a username, su defaults to becoming the super user. +//config: Note that busybox binary must be setuid root for this applet to +//config: work properly. //config: //config:config FEATURE_SU_SYSLOG //config: bool "Log to syslog all attempts to use su" diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index cdc2c8c5a..d5a463cac 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c @@ -9,8 +9,8 @@ //config: default y //config: select FEATURE_SYSLOG //config: help -//config: sulogin is invoked when the system goes into single user -//config: mode (this is done through an entry in inittab). +//config: sulogin is invoked when the system goes into single user +//config: mode (this is done through an entry in inittab). //applet:IF_SULOGIN(APPLET(sulogin, BB_DIR_SBIN, BB_SUID_DROP)) diff --git a/loginutils/vlock.c b/loginutils/vlock.c index e3b701d53..f22abd3aa 100644 --- a/loginutils/vlock.c +++ b/loginutils/vlock.c @@ -19,10 +19,10 @@ //config: bool "vlock (17 kb)" //config: default y //config: help -//config: Build the "vlock" applet which allows you to lock (virtual) terminals. +//config: Build the "vlock" applet which allows you to lock (virtual) terminals. //config: -//config: Note that Busybox binary must be setuid root for this applet to -//config: work properly. +//config: Note that Busybox binary must be setuid root for this applet to +//config: work properly. //applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */ //applet:IF_VLOCK(APPLET(vlock, BB_DIR_USR_BIN, BB_SUID_REQUIRE)) |