浏览代码

r17274@catbus: nickm | 2007-12-20 01:14:09 -0500
Don't try to create the datadir when we are only verifying the configuration or hashing a password. Resolves bug 540.


svn:r12884

Nick Mathewson 16 年之前
父节点
当前提交
2f922937d3
共有 2 个文件被更改,包括 4 次插入1 次删除
  1. 2 0
      ChangeLog
  2. 2 1
      src/or/config.c

+ 2 - 0
ChangeLog

@@ -399,6 +399,8 @@ Changes in version 0.1.2.18 - 2007-10-28
       is fishy. Resolves bug 463.
     - Don't reset trusted dir server list when we set a configuration
       option. Patch from Robert Hogan.
+    - Don't try to create the datadir when running --verify-config or
+      --hash-password. Resolves bug 540.
 
 
 Changes in version 0.2.0.9-alpha - 2007-10-24

+ 2 - 1
src/or/config.c

@@ -1004,7 +1004,8 @@ options_act_reversible(or_options_t *old_options, char **msg)
   }
 
   /* Ensure data directory is private; create if possible. */
-  if (check_private_dir(options->DataDirectory, CPD_CREATE)<0) {
+  if (check_private_dir(options->DataDirectory,
+                        running_tor ? CPD_CREATE : CPD_CHECK)<0) {
     char buf[1024];
     int tmp = tor_snprintf(buf, sizeof(buf),
               "Couldn't access/create private data directory \"%s\"",