mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* sign.c (do_sign): Show the hash used when making a signature in verbose
mode. * tdbio.h, tdbio.c (tdbio_read_model): New function to return the trust model used in a given trustdb. * options.h, g10.c (main), trustdb.c (init_trustdb, check_trustdb, update_trustdb): Use tdbio_read_model to implement an "auto" trust model which is set via the trustdb.
This commit is contained in:
parent
e0373e85a9
commit
a01bda6abd
7 changed files with 68 additions and 26 deletions
|
@ -1172,7 +1172,7 @@ main( int argc, char **argv )
|
|||
opt.keyserver_options.include_subkeys=1;
|
||||
opt.keyserver_options.include_revoked=1;
|
||||
opt.keyserver_options.try_dns_srv=1;
|
||||
opt.trust_model=TM_OPENPGP;
|
||||
opt.trust_model=TM_AUTO;
|
||||
opt.mangle_dos_filenames = 1;
|
||||
|
||||
#if defined (__MINGW32__)
|
||||
|
@ -1493,6 +1493,8 @@ main( int argc, char **argv )
|
|||
opt.trust_model=TM_CLASSIC;
|
||||
else if(ascii_strcasecmp(pargs.r.ret_str,"always")==0)
|
||||
opt.trust_model=TM_ALWAYS;
|
||||
else if(ascii_strcasecmp(pargs.r.ret_str,"auto")==0)
|
||||
opt.trust_model=TM_AUTO;
|
||||
else
|
||||
log_error("unknown trust model \"%s\"\n",pargs.r.ret_str);
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue