torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

r19101@catbus: nickm | 2008-03-27 12:56:29 -0400

Browse Source 
Backport r14214.  This is not 100% trivial, options_init_from_torrc() got cleaned up a lot.  The fact that it was much easier to do in trunk probably means that the cleanups were the right thing to do.


svn:r14219
This commit is contained in:
Nick Mathewson
2008-03-27 16:56:36 +00:00
parent f5557c0d28
commit f58d16ed9e
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3 -1
View File
@@ -2,7 +2,9 @@ Changes in version 0.2.0.24-?? - 2008-??-??
o Minor bugfixes:
- Initialize log mutex before initializing dmalloc. Otherwise,
running with dmalloc would crash. Bugfix on 0.2.0.x-alpha.
- Do not read the configuration file when we've only been told to
generate a password hash. Fixes bug 643. Bugfix on 0.0.9pre5. Fix
based on patch from Sebastian Hahn.
Changes in version 0.2.0.23-rc - 2008-03-24
o Major bugfixes:
src/or/config.c
+15 -8
View File
@@ -3535,6 +3535,7 @@ options_init_from_torrc(int argc, char **argv)
int i, retval;
int using_default_torrc;
int ignore_missing_torrc;
int ignore_torrc = 0;
static char **backup_argv;
static int backup_argc;
@@ -3597,11 +3598,12 @@ options_init_from_torrc(int argc, char **argv)
newoptions->command = CMD_HASH_PASSWORD;
newoptions->command_arg = tor_strdup( (i < argc-1) ? argv[i+1] : "");
++i;
ignore_torrc = 1;
} else if (!strcmp(argv[i],"--verify-config")) {
newoptions->command = CMD_VERIFY_CONFIG;
}
}
if (using_default_torrc) {
if (using_default_torrc && !ignore_torrc) {
/* didn't find one, try CONFDIR */
const char *dflt = get_default_conf_file();
if (dflt && file_status(dflt) == FN_FILE) {
@@ -3621,16 +3623,20 @@ options_init_from_torrc(int argc, char **argv)
#endif
}
}
tor_assert(fname);
log(LOG_DEBUG, LD_CONFIG, "Opening config file \"%s\"", fname);
if (!ignore_torrc) {
tor_assert(fname);
log(LOG_DEBUG, LD_CONFIG, "Opening config file \"%s\"", fname);
tor_free(torrc_fname);
torrc_fname = fname;
tor_free(torrc_fname);
torrc_fname = fname;
}
/* get config lines, assign them */
if (file_status(fname) != FN_FILE ||
if (ignore_torrc) {
cf = tor_strdup("");
} else if (file_status(fname) != FN_FILE ||
!(cf = read_file_to_str(fname,0,NULL))) {
if (using_default_torrc == 1 || ignore_missing_torrc ) {
if (using_default_torrc == 1 || ignore_missing_torrc) {
log(LOG_NOTICE, LD_CONFIG, "Configuration file \"%s\" not present, "
"using reasonable defaults.", fname);
tor_free(fname); /* sets fname to NULL */
@@ -3640,7 +3646,8 @@ options_init_from_torrc(int argc, char **argv)
"Unable to open configuration file \"%s\".", fname);
goto err;
}
} else { /* it opened successfully. use it. */
}
if (cf) { /* It opened successfully. use it. */
retval = config_get_lines(cf, &cl);
tor_free(cf);
if (retval < 0)