security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-13 22:21:09 +02:00
Code Activity

doc: Clarify use of clear and nodefault in the AKL.

Browse Source 
--

(cherry picked from commit e5c3a6999a374813134a9e68744444c25c3017f6)
This commit is contained in:
Werner Koch 2018-11-21 09:20:56 +01:00
parent 2768293b1e
commit 6acca0e4d9
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/gpg.texi
View File

@ -1783,7 +1783,9 @@ list. The default is "local,wkd".
@item clear @item clear
Clear all defined mechanisms. This is useful to override Clear all defined mechanisms. This is useful to override
mechanisms given in a config file. mechanisms given in a config file. Note that a @code{nodefault} in
@var{mechanisms} will also be cleared unless it is given after the
@code{clear}.
@end table @end table

2
g10/gpg.c
View File

@ -3487,7 +3487,7 @@ main (int argc, char **argv)
case oAutoKeyLocate: case oAutoKeyLocate:
if (default_akl) if (default_akl)
{ {
/* This is the first time --aito-key-locate is seen. /* This is the first time --auto-key-locate is seen.
* We need to reset the default akl. */ * We need to reset the default akl. */
default_akl = 0; default_akl = 0;
release_akl(); release_akl();