diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-08-16 19:27:31 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-08-16 19:27:31 +0000 |
| commit | 2df9bb937d94697eda4af74c92e534f07278a857 (patch) | |
| tree | f302566d60669483e2bfd1930e0f130ae6ac4dfb | |
| parent | 718953dbe97446e0c2b4b1ccae3b2be0d36473a1 (diff) | |
| download | tor-2df9bb937d94697eda4af74c92e534f07278a857.tar.gz tor-2df9bb937d94697eda4af74c92e534f07278a857.zip | |
clean up the cookieauth stuff
svn:r11146
| -rw-r--r-- | doc/tor.1.in | 7 | ||||
| -rw-r--r-- | src/or/config.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in index 7c92fd4823..5be54902ef 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -166,7 +166,7 @@ compute the hash of a password by running "tor --hash-password If this option is set to 1, don't allow any connections on the control port except when the connecting process knows the contents of a file named "control_auth_cookie", which Tor will create in its data directory. This -authentication methods should only be used on systems with good filesystem +authentication method should only be used on systems with good filesystem security. (Default: 0) .LP .TP @@ -1181,7 +1181,10 @@ recording of statistics is enabled. .LP .TP .B \fIDataDirectory\fP/control_auth_cookie -Used for cookie authentication with the controller. Regenerated on startup. See control-spec.txt for details. Only used when cookie authentication is enabled. +Used for cookie authentication with the controller. Location can be +overridden by the CookieAuthFile config option. Regenerated on startup. +See control-spec.txt for details. Only used when cookie authentication +is enabled. .LP .TP .B \fIDataDirectory\fP/keys/* diff --git a/src/or/config.c b/src/or/config.c index 2ee672384f..e76db2cfdb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -152,9 +152,8 @@ static config_var_t _option_vars[] = { VAR("ControlPort", UINT, ControlPort, "0"), VAR("ControlSocket", LINELIST, ControlSocket, NULL), VAR("CookieAuthentication",BOOL, CookieAuthentication, "0"), - VAR("CookieAuthFileGroupReadable",BOOL, CookieAuthFileGroupReadable, "0"), + VAR("CookieAuthFileGroupReadable",BOOL,CookieAuthFileGroupReadable, "0"), VAR("CookieAuthFile", STRING, CookieAuthFile, "0"), - VAR("CookieAuthentication",BOOL, CookieAuthentication, "0"), VAR("DataDirectory", STRING, DataDirectory, NULL), OBSOLETE("DebugLogFile"), VAR("DirAllowPrivateAddresses",BOOL, DirAllowPrivateAddresses, NULL), |