diff options
| author | David Shaw <[email protected]> | 2003-04-26 20:38:16 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-04-26 20:38:16 +0000 |
| commit | a01bda6abdaa7e693b9637d3f467c348d0160db5 (patch) | |
| tree | 3143855966cee066a9abdb25739229494b662f52 /g10/g10.c | |
| parent | * config.links: Re-disable assembler on Darwin. Darwin 6.5 broke it (diff) | |
| download | gnupg-a01bda6abdaa7e693b9637d3f467c348d0160db5.tar.gz gnupg-a01bda6abdaa7e693b9637d3f467c348d0160db5.zip | |
* 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.
Diffstat (limited to 'g10/g10.c')
| -rw-r--r-- | g10/g10.c | 4 |
1 files changed, 3 insertions, 1 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; |