security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-08 12:44:23 +01:00
Code Activity

dirmngr: Do not check for Tor for --gpgconf-* options

Browse Source 
* dirmngr/dirmngr.c (post_option_parsing): Add arg CMD.
(main): Pass the current command.
This commit is contained in:
Werner Koch 2023-01-11 11:08:47 +01:00
parent b7f21f9f21
commit 818051432c
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dirmngr/dirmngr.c
View File

@ -887,7 +887,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
/* This fucntion is called after option parsing to adjust some values /* This fucntion is called after option parsing to adjust some values
* and call option setup functions. */ * and call option setup functions. */
static void static void
post_option_parsing (void) post_option_parsing (enum cmd_and_opt_values cmd)
{ {
/* It would be too surpirsing if the quick timeout is larger than /* It would be too surpirsing if the quick timeout is larger than
* the standard value. */ * the standard value. */
@ -895,7 +895,18 @@ post_option_parsing (void)
opt.connect_quick_timeout = opt.connect_timeout; opt.connect_quick_timeout = opt.connect_timeout;
set_debug (); set_debug ();
set_tor_mode (); /* For certain commands we do not want to set/test for Tor mode
* because that is somewhat expensive. */
switch (cmd)
{
case aGPGConfList:
case aGPGConfTest:
case aGPGConfVersions:
break;
default:
set_tor_mode ();
break;
}
} }
@ -1208,7 +1219,7 @@ main (int argc, char **argv)
log_printf ("\n"); log_printf ("\n");
} }
post_option_parsing (); post_option_parsing (cmd);
/* Get LDAP server list from file unless --ldapserver has been used. */ /* Get LDAP server list from file unless --ldapserver has been used. */
#if USE_LDAP #if USE_LDAP
@ -1944,7 +1955,7 @@ reread_configuration (void)
} }
gnupg_argparse (NULL, &pargs, NULL); /* Release internal state. */ gnupg_argparse (NULL, &pargs, NULL); /* Release internal state. */
xfree (twopart); xfree (twopart);
post_option_parsing (); post_option_parsing (0);
} }