1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

* keyedit.c (menu_deluid): Only cause a trust update if we delete a

non-revoked user id.

* hkp.c (hkp_ask_import), keyserver.c (parse_keyserver_options,
keyserver_spawn), options.h: Remove fast-import keyserver option (no
longer meaningful).

* g10.c (main), keyedit.c (sign_uids), options.h: Change
--default-check-level to --default-cert-check-level as it makes clear what
it operates on.

* g10.c (main): --pgp6 also implies --no-ask-sig-expire.

* delkey.c (do_delete_key): Comment.
This commit is contained in:
David Shaw 2002-04-19 22:38:20 +00:00
parent 5aab7388df
commit f06ee291db
7 changed files with 39 additions and 22 deletions

View file

@ -51,11 +51,7 @@ parse_keyserver_options(char *options)
do
{
if(strcasecmp(tok,"fast-import")==0)
opt.keyserver_options.fast_import=1;
else if(strcasecmp(tok,"no-fast-import")==0)
opt.keyserver_options.fast_import=0;
else if(strcasecmp(tok,"include-revoked")==0)
if(strcasecmp(tok,"include-revoked")==0)
opt.keyserver_options.include_revoked=1;
else if(strcasecmp(tok,"no-include-revoked")==0)
opt.keyserver_options.include_revoked=0;
@ -518,8 +514,7 @@ keyserver_spawn(int action,STRLIST list,
do this could be to continue parsing this line-by-line and
make a temp iobuf for each key. */
import_keys_stream(spawn->fromchild,
opt.keyserver_options.fast_import,stats_handle);
import_keys_stream(spawn->fromchild,0,stats_handle);
import_print_stats(stats_handle);
import_release_stats_handle(stats_handle);