diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
| commit | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (patch) | |
| tree | 6709ddd6071a9c238ba69233540bbcfe560c6a44 /Config.in | |
| parent | 67758035a4fe040c6ac69b39d61bcd6bddd7b827 (diff) | |
| parent | 56a3b82e9692a25ef9c9269e88feac0d579ce8e8 (diff) | |
| download | busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.gz busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.bz2 busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.zip | |
Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge
Conflicts:
coreutils/ls.c
include/platform.h
libbb/bb_basename.c
Diffstat (limited to 'Config.in')
| -rw-r--r-- | Config.in | 22 |
1 files changed, 17 insertions, 5 deletions
| @@ -271,8 +271,9 @@ config UNICODE_PRESERVE_BROKEN | |||
| 271 | default n | 271 | default n |
| 272 | depends on UNICODE_SUPPORT | 272 | depends on UNICODE_SUPPORT |
| 273 | help | 273 | help |
| 274 | With this option on, invalid UTF-8 bytes are not substituted | 274 | With this option on, on line-editing input (such as used by shells) |
| 275 | with the selected substitution character. | 275 | invalid UTF-8 bytes are not substituted with the selected |
| 276 | substitution character. | ||
| 276 | For example, this means that entering 'l', 's', ' ', 0xff, [Enter] | 277 | For example, this means that entering 'l', 's', ' ', 0xff, [Enter] |
| 277 | at shell prompt will list file named 0xff (single char name | 278 | at shell prompt will list file named 0xff (single char name |
| 278 | with char value 255), not file named '?'. | 279 | with char value 255), not file named '?'. |
| @@ -365,14 +366,24 @@ config FEATURE_SUID | |||
| 365 | 366 | ||
| 366 | config FEATURE_SUID_CONFIG | 367 | config FEATURE_SUID_CONFIG |
| 367 | bool "Runtime SUID/SGID configuration via /etc/busybox.conf" | 368 | bool "Runtime SUID/SGID configuration via /etc/busybox.conf" |
| 368 | default y if FEATURE_SUID | 369 | default y |
| 369 | depends on FEATURE_SUID | 370 | depends on FEATURE_SUID |
| 370 | help | 371 | help |
| 371 | Allow the SUID / SGID state of an applet to be determined at runtime | 372 | Allow the SUID / SGID state of an applet to be determined at runtime |
| 372 | by checking /etc/busybox.conf. (This is sort of a poor man's sudo.) | 373 | by checking /etc/busybox.conf. (This is sort of a poor man's sudo.) |
| 373 | The format of this file is as follows: | 374 | The format of this file is as follows: |
| 374 | 375 | ||
| 375 | <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>) | 376 | APPLET = [Ssx-][Ssx-][x-] [USER.GROUP] |
| 377 | |||
| 378 | s: USER or GROUP is allowed to execute APPLET. | ||
| 379 | APPLET will run under USER or GROUP | ||
| 380 | (reagardless of who's running it). | ||
| 381 | S: USER or GROUP is NOT allowed to execute APPLET. | ||
| 382 | APPLET will run under USER or GROUP. | ||
| 383 | This option is not very sensical. | ||
| 384 | x: USER/GROUP/others are allowed to execute APPLET. | ||
| 385 | No UID/GID change will be done when it is run. | ||
| 386 | -: USER/GROUP/others are not allowed to execute APPLET. | ||
| 376 | 387 | ||
| 377 | An example might help: | 388 | An example might help: |
| 378 | 389 | ||
| @@ -382,7 +393,8 @@ config FEATURE_SUID_CONFIG | |||
| 382 | su = ssx # exactly the same | 393 | su = ssx # exactly the same |
| 383 | 394 | ||
| 384 | mount = sx- root.disk # applet mount can be run by root and members | 395 | mount = sx- root.disk # applet mount can be run by root and members |
| 385 | # of group disk and runs with euid=0 | 396 | # of group disk (but not anyone else) |
| 397 | # and runs with euid=0 (egid is not changed) | ||
| 386 | 398 | ||
| 387 | cp = --- # disable applet cp for everyone | 399 | cp = --- # disable applet cp for everyone |
| 388 | 400 | ||