diff options
| author | Werner Koch <[email protected]> | 2017-12-18 11:05:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-12-18 11:05:31 +0000 |
| commit | 8c878ae4c9dfa9fe26aa15f4f9db3e86833575e9 (patch) | |
| tree | e9e476ce236184585fa6c9cb38554e7791a2077b /doc/examples | |
| parent | po: Update Japanese translation. (diff) | |
| download | gnupg-8c878ae4c9dfa9fe26aa15f4f9db3e86833575e9.tar.gz gnupg-8c878ae4c9dfa9fe26aa15f4f9db3e86833575e9.zip | |
sm: Allow explicit setting of the default --compliance=gnupg
* sm/gpgsm.c (main): Allow setting of the default compliance.
* tools/gpgconf-comp.c (gc_options_gpgsm): Add "compliance".
--
This is required so that we can use this option in in gpgconf.conf.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'doc/examples')
| -rw-r--r-- | doc/examples/gpgconf.conf | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/examples/gpgconf.conf b/doc/examples/gpgconf.conf index f40160249..95e463b6e 100644 --- a/doc/examples/gpgconf.conf +++ b/doc/examples/gpgconf.conf @@ -31,8 +31,7 @@ # # Example file: #========== -# :staff gpg-agent allow-mark-trusted [change] -# gpg-agent min-passphrase-len 6 +# :staff gpg-agent min-passphrase-len 6 [change] # # * gpg-agent min-passphrase-len [no-change] 8 # gpg-agent min-passphrase-nonalpha [no-change] 1 @@ -42,9 +41,9 @@ # gpg-agent enforce-passphrase-constraints [no-change] # gpg-agent max-cache-ttl [no-change] 10800 # gpg-agent max-cache-ttl-ssh [no-change] 10800 -# gpg-agent allow-mark-trusted [default] -# gpg-agent allow-mark-trusted [no-change] # gpgsm enable-ocsp +# gpg compliance [no-change] +# gpgsm compliance [no-change] #=========== # All users in the group "staff" are allowed to change the value for # --allow-mark-trusted; gpgconf's default is not to allow a change |