diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-06-25 10:00:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-06-25 10:01:40 -0400 |
| commit | 62e1d983cf362d6769e763e8b50ab8a51bdc84d4 (patch) | |
| tree | ac235fa96b028445cfb2556a2f03d8ebec7ef6f9 /src/app/main | |
| parent | c370b4a049bd99e45b2dcfd4b0824901234f8b17 (diff) | |
| download | tor-62e1d983cf362d6769e763e8b50ab8a51bdc84d4.tar.gz tor-62e1d983cf362d6769e763e8b50ab8a51bdc84d4.zip | |
Deprecate the "--dump-config non-builtin" option
When it works, "non-builtin" doesn't do anything different from
"short". (When it doesn't work, it gives an assertion failure.)
Closes ticket #33398.
Diffstat (limited to 'src/app/main')
| -rw-r--r-- | src/app/main/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c index 32c34ea821..93f2c9c2dd 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -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; } |