diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
commit | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (patch) | |
tree | f5ec7ac45234c25794c97f87e9a6daa8a551e57c /Config.in | |
parent | 72394258b6509b40e0fa08594ac86215a558dfd8 (diff) | |
parent | 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (diff) | |
download | busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.gz busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.bz2 busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.zip |
Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge
Conflicts:
include/platform.h
libbb/Kbuild.src
libbb/messages.c
Diffstat (limited to 'Config.in')
-rw-r--r-- | Config.in | 34 |
1 files changed, 21 insertions, 13 deletions
@@ -307,10 +307,19 @@ config FEATURE_CLEAN_UP | |||
307 | Don't enable this unless you have a really good reason to clean | 307 | Don't enable this unless you have a really good reason to clean |
308 | things up manually. | 308 | things up manually. |
309 | 309 | ||
310 | config FEATURE_UTMP | ||
311 | bool "Support utmp file" | ||
312 | default y | ||
313 | help | ||
314 | The file /var/run/utmp is used to track who is currently logged in. | ||
315 | With this option on, certain applets (getty, login, telnetd etc) | ||
316 | will create and delete entries there. | ||
317 | "who" applet requires this option. | ||
318 | |||
310 | config FEATURE_WTMP | 319 | config FEATURE_WTMP |
311 | bool "Support wtmp file" | 320 | bool "Support wtmp file" |
312 | default y | 321 | default y |
313 | select FEATURE_UTMP | 322 | depends on FEATURE_UTMP |
314 | help | 323 | help |
315 | The file /var/run/wtmp is used to track when users have logged into | 324 | The file /var/run/wtmp is used to track when users have logged into |
316 | and logged out of the system. | 325 | and logged out of the system. |
@@ -318,15 +327,6 @@ config FEATURE_WTMP | |||
318 | will append new entries there. | 327 | will append new entries there. |
319 | "last" applet requires this option. | 328 | "last" applet requires this option. |
320 | 329 | ||
321 | config FEATURE_UTMP | ||
322 | bool "Support utmp file" | ||
323 | default y | ||
324 | help | ||
325 | The file /var/run/utmp is used to track who is currently logged in. | ||
326 | With this option on, certain applets (getty, login, telnetd etc) | ||
327 | will create and delete entries there. | ||
328 | "who" applet requires this option. | ||
329 | |||
330 | config FEATURE_PIDFILE | 330 | config FEATURE_PIDFILE |
331 | bool "Support writing pidfiles" | 331 | bool "Support writing pidfiles" |
332 | default y | 332 | default y |
@@ -351,10 +351,18 @@ config FEATURE_SUID | |||
351 | symlinks pointing to each binary), and only set the suid bit on the | 351 | symlinks pointing to each binary), and only set the suid bit on the |
352 | one that needs it. | 352 | one that needs it. |
353 | 353 | ||
354 | The applets currently marked to need the suid bit are: | 354 | The applets which require root rights (need suid bit or |
355 | to be run by root) and will refuse to execute otherwise: | ||
356 | crontab, login, passwd, su, vlock, wall. | ||
357 | |||
358 | The applets which will use root rights if they have them | ||
359 | (via suid bit, or because run by root), but would try to work | ||
360 | without root right nevertheless: | ||
361 | findfs, ping[6], traceroute[6], mount. | ||
355 | 362 | ||
356 | crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su, | 363 | Note that if you DONT select this option, but DO make busybox |
357 | traceroute, vlock. | 364 | suid root, ALL applets will run under root, which is a huge |
365 | security hole (think "cp /some/file /etc/passwd"). | ||
358 | 366 | ||
359 | config FEATURE_SUID_CONFIG | 367 | config FEATURE_SUID_CONFIG |
360 | bool "Runtime SUID/SGID configuration via /etc/busybox.conf" | 368 | bool "Runtime SUID/SGID configuration via /etc/busybox.conf" |