tor

commit 069566b40a94f8876e813fed39176bc403bfffd1
parent 374626c09b8c3f5752a99eeee16ac8654cf531a1
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 25 Jun 2020 13:41:45 -0400

Merge branch 'tor-github/pr/1951'

Diffstat:
A
changes/ticket33398
 | 
4
++++
M
doc/tor.1.txt
 | 
7
+++----
M
src/app/config/config.c
 | 
4
----
M
src/app/config/config.h
 | 
3
+--
M
src/app/main/main.c
 | 
6
++++--

5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/changes/ticket33398 b/changes/ticket33398
@@ -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.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
@@ -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__]::
diff --git a/src/app/config/config.c b/src/app/config/config.c
@@ -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;
diff --git a/src/app/config/config.h b/src/app/config/config.h
@@ -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,
diff --git 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;
   }