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

ok, ok, csv's get replaced even when we assign them from the torrc.

Browse Source 
svn:r5041
This commit is contained in:
Roger Dingledine
2005-09-14 02:12:29 +00:00
parent 1f930a9a70
commit 62fe24c40c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/config.c
+5 -4
View File
@@ -834,9 +834,9 @@ config_assign_value(config_format_t *fmt, or_options_t *options,
case CONFIG_TYPE_CSV:
if (!*(smartlist_t**)lvalue) {
// SMARTLIST_FOREACH(*(smartlist_t**)lvalue, char *, cp, tor_free(cp));
// smartlist_clear(*(smartlist_t**)lvalue);
// } else {
SMARTLIST_FOREACH(*(smartlist_t**)lvalue, char *, cp, tor_free(cp));
smartlist_clear(*(smartlist_t**)lvalue);
} else {
*(smartlist_t**)lvalue = smartlist_create();
}
@@ -1057,7 +1057,8 @@ get_assigned_option(config_format_t *fmt, or_options_t *options, const char *key
* clearing, or make the value 0 or NULL.
*
* Here are the use cases:
* 1. A non-empty AllowUnverified line in your torrc. Appends to current.
* 1. A non-empty AllowUnverified line in your torrc. Appends to current
* if linelist, replaces current if csv.
* 2. An empty AllowUnverified line in your torrc. Should clear it.
* 3. "RESETCONF AllowUnverified" sets it to default.
* 4. "SETCONF AllowUnverified" makes it NULL.