clean up the cookieauth stuff

svn:r11146
This commit is contained in:
Roger Dingledine 2007-08-16 19:27:31 +00:00
parent 718953dbe9
commit 2df9bb937d
2 changed files with 6 additions and 4 deletions

View File

@ -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/*

View File

@ -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),