nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-github/pr/1951'

Browse Source
This commit is contained in:
David Goulet 2020-06-25 13:41:45 -04:00
commit 069566b40a
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket33398 Normal file
View File

@ -0,0 +1,4 @@
o Deprecated features:
- The "non-builtin" argument to the "--dump-config" command is now
deprecated. When it works, it behaves the same as "short", which
you should use instead. Closes ticket 33398.

7
doc/tor.1.txt
View File

@ -97,11 +97,10 @@ The following options in this section are only recognized on the
[[opt-verify-config]] **`--verify-config`**::
Verify whether the configuration file is valid.
[[opt-dump-config]] **`--dump-config`** **`short`**|**`full`**|**`non-builtin`**::
Write a complete list of Tor's configured options to standard output.
[[opt-dump-config]] **`--dump-config`** **`short`**|**`full`**::
Write a list of Tor's configured options to standard output.
When the `short` flag is selected, only write the options that
are different from their default values. When `non-builtin` is selected,
write options that are not zero or the empty string.
are different from their default values
When `full` is selected, write every option.
[[opt-serviceinstall]] **`--service install`** [**`--options`** __command-line options__]::

4
src/app/config/config.c
View File

@ -2771,10 +2771,6 @@ options_dump(const or_options_t *options, int how_to_dump)
use_defaults = global_default_options;
minimal = 1;
break;
case OPTIONS_DUMP_DEFAULTS:
use_defaults = NULL;
minimal = 1;
break;
case OPTIONS_DUMP_ALL:
use_defaults = NULL;
minimal = 0;

3
src/app/config/config.h
View File

@ -58,8 +58,7 @@ setopt_err_t options_trial_assign(struct config_line_t *list, unsigned flags,
void options_init(or_options_t *options);
#define OPTIONS_DUMP_MINIMAL 1
#define OPTIONS_DUMP_DEFAULTS 2
#define OPTIONS_DUMP_ALL 3
#define OPTIONS_DUMP_ALL 2
char *options_dump(const or_options_t *options, int how_to_dump);
int options_init_from_torrc(int argc, char **argv);
setopt_err_t options_init_from_string(const char *cf_defaults, const char *cf,

6
src/app/main/main.c
View File

@ -775,12 +775,14 @@ do_dump_config(void)
if (!strcmp(arg, "short")) {
how = OPTIONS_DUMP_MINIMAL;
} else if (!strcmp(arg, "non-builtin")) {
how = OPTIONS_DUMP_DEFAULTS;
// Deprecated since 0.4.5.1-alpha.
fprintf(stderr, "'non-builtin' is deprecated; use 'short' instead.\n");
how = OPTIONS_DUMP_MINIMAL;
} else if (!strcmp(arg, "full")) {
how = OPTIONS_DUMP_ALL;
} else {
fprintf(stderr, "No valid argument to --dump-config found!\n");
fprintf(stderr, "Please select 'short', 'non-builtin', or 'full'.\n");
fprintf(stderr, "Please select 'short' or 'full'.\n");
return -1;
}