diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-11-26 11:03:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-15 13:10:57 -0500 |
| commit | 405a8d3fb4884d5e5c5f32881a1a810b733a5aad (patch) | |
| tree | 53fbd1b246592d767837236082f44b3a5bf4cba0 /doc | |
| parent | fd0c6671d13333f2ddb41e792b40162c841adae6 (diff) | |
| download | tor-405a8d3fb4884d5e5c5f32881a1a810b733a5aad.tar.gz tor-405a8d3fb4884d5e5c5f32881a1a810b733a5aad.zip | |
Update KeepCapabilities based on comments from asn
* The option is now KeepBindCapabilities
* We now warn if the user specifically asked for KeepBindCapabilities
and we can't deliver.
* The unit tests are willing to start.
* Fewer unused-variable warnings.
* More documentation, fewer misspellings.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a7bf28bbd5..58313d8a49 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -601,9 +601,9 @@ GENERAL OPTIONS [[User]] **User** __UID__:: On startup, setuid to this user and setgid to their primary group. -[[KeepCapabilities]] **KeepCapabilities** **0**|**1**|**auto**:: +[[KeepBindCapabilities]] **KeepBindCapabilities** **0**|**1**|**auto**:: On Linux, when we are started as root and we switch our identity using - the **User** option, the **KeepCapabilities** option tells us whether to + the **User** option, the **KeepBindCapabilities** option tells us whether to try to retain our ability to bind to low ports. If this value is 1, we try to keep the capability; if it is 0 we do not; and if it is **auto**, we keep the capability only if we are configured to listen on a low port. |