If DataDir is ~/.tor, and that expands to /.tor, then default to LOCALSTATEDIR/tor instead.

svn:r4170
This commit is contained in:
Nick Mathewson 2005-05-03 00:36:57 +00:00
parent 14bac4dad4
commit 4666b801fa

View file

@ -2336,7 +2336,10 @@ normalize_data_directory(or_options_t *options) {
if (!options->DataDirectory && !strcmp(fn,"/.tor")) {
/* If our homedir is /, we probably don't want to use it. */
/* XXXX Default to /var/lib/tor? */
log_fn(LOG_WARN, "Defaulting to 'DataDirectory %s', which may not be what you want", fn);
log_fn(LOG_WARN, "Default DataDirectory is ~/.tor, which works out to %s, which is probably not what you want. Using %s/tor instead", fn, LOCALSTATEDIR);
tor_free(fn);
fn = tor_strdup(LOCALSTATEDIR"/tor");
}
tor_free(options->DataDirectory);
options->DataDirectory = fn;