mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
gpgconf: New command --apply-profile.
* tools/gpgconf.c (aApplyProfile): New. (opts): New command --apply-profile. (main): Implement that command. * tools/gpgconf-comp.c (option_check_validity): Add arg VERBATIM. (change_options_program): Ditto. (change_one_value): Ditto. (gc_component_change_options): Ditto. (gc_apply_profile): New. -- Here is an example for a profile --8<---------------cut here---------------start------------->8--- # foo.prf - Sample profile [gpg] compliance de-vs default-new-key-algo brainpoolP256r1+brainpoolP256r1 [gpgsm] enable-crl-checks [gpg-agent] default-cache-ttl 900 max-cache-ttl [] 3600 no-allow-mark-trusted no-allow-external-cache enforce-passphrase-constraints min-passphrase-len 9 min-passphrase-nonalpha 0 [dirmngr] keyserver hkp://keys.gnupg.net allow-ocsp --8<---------------cut here---------------end--------------->8--- Note that flags inside of brackets are allowed after the option name. The only defined flag for now is "[default]". In case the value starts with a bracket, it is possible to insert "[]" as a nop-flag. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
6ca3c28da4
commit
76cd64a5ba
6 changed files with 293 additions and 38 deletions
|
@ -60,6 +60,7 @@ enum cmd_and_opt_values
|
|||
aKill,
|
||||
aCreateSocketDir,
|
||||
aRemoveSocketDir,
|
||||
aApplyProfile,
|
||||
aReload
|
||||
};
|
||||
|
||||
|
@ -76,6 +77,8 @@ static ARGPARSE_OPTS opts[] =
|
|||
{ aCheckOptions, "check-options", 256, N_("|COMPONENT|check options") },
|
||||
{ aApplyDefaults, "apply-defaults", 256,
|
||||
N_("apply global default values") },
|
||||
{ aApplyProfile, "apply-profile", 256,
|
||||
N_("|FILE|update configuration files using FILE") },
|
||||
{ aListDirs, "list-dirs", 256,
|
||||
N_("get the configuration directories for @GPGCONF@") },
|
||||
{ aListConfig, "list-config", 256,
|
||||
|
@ -495,6 +498,7 @@ main (int argc, char **argv)
|
|||
case aChangeOptions:
|
||||
case aCheckOptions:
|
||||
case aApplyDefaults:
|
||||
case aApplyProfile:
|
||||
case aListConfig:
|
||||
case aCheckConfig:
|
||||
case aQuerySWDB:
|
||||
|
@ -568,7 +572,8 @@ main (int argc, char **argv)
|
|||
if (cmd == aListOptions)
|
||||
gc_component_list_options (idx, get_outfp (&outfp));
|
||||
else if (cmd == aChangeOptions)
|
||||
gc_component_change_options (idx, es_stdin, get_outfp (&outfp));
|
||||
gc_component_change_options (idx, es_stdin,
|
||||
get_outfp (&outfp), 0);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -659,6 +664,12 @@ main (int argc, char **argv)
|
|||
exit (1);
|
||||
break;
|
||||
|
||||
case aApplyProfile:
|
||||
gc_component_retrieve_options (-1);
|
||||
if (gc_apply_profile (fname))
|
||||
exit (1);
|
||||
break;
|
||||
|
||||
case aListDirs:
|
||||
/* Show the system configuration directories for gpgconf. */
|
||||
get_outfp (&outfp);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue