diff options
Diffstat (limited to 'g10/gpg.c')
| -rw-r--r-- | g10/gpg.c | 37 |
1 files changed, 3 insertions, 34 deletions
@@ -1928,48 +1928,17 @@ list_config(char *items) } -/* List options and default values in the GPG Conf format. This is a - new tool distributed with gnupg 1.9.x but we also want some limited - support in older gpg versions. The output is the name of the - configuration file and a list of options available for editing by - gpgconf. */ +/* List default values for use by gpgconf. */ static void -gpgconf_list (const char *configfile) +gpgconf_list (void) { - char *configfile_esc = percent_escape (configfile, NULL); - - es_printf ("%s-%s.conf:%lu:\"%s\n", - GPGCONF_NAME, GPG_NAME, - GC_OPT_FLAG_DEFAULT, - configfile_esc ? configfile_esc : "/dev/null"); - es_printf ("verbose:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("quiet:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("keyserver:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("reader-port:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("default-key:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("encrypt-to:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("try-secret-key:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("auto-key-locate:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("auto-key-import:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("include-key-block:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("auto-key-retrieve:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("log-file:%lu:\n", GC_OPT_FLAG_NONE); es_printf ("debug-level:%lu:\"none:\n", GC_OPT_FLAG_DEFAULT); - es_printf ("group:%lu:\n", GC_OPT_FLAG_NONE); es_printf ("compliance:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "gnupg"); - es_printf ("default-new-key-algo:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("trust-model:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("disable-dirmngr:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("max-cert-depth:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("completes-needed:%lu:\n", GC_OPT_FLAG_NONE); - es_printf ("marginals-needed:%lu:\n", GC_OPT_FLAG_NONE); /* The next one is an info only item and should match the macros at the top of keygen.c */ es_printf ("default_pubkey_algo:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, get_default_pubkey_algo ()); - - xfree (configfile_esc); } @@ -3680,7 +3649,7 @@ main (int argc, char **argv) directly after the option parsing. */ if (cmd == aGPGConfList) { - gpgconf_list (last_configname ? last_configname : "UNKNOWN"); + gpgconf_list (); g10_exit (0); } xfree (last_configname); |