From c930e300a8ce3f40fd688d927c66e0a12de5f525 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 8 Jan 2002 19:40:01 +0000 Subject: [PATCH] * g10.c (main): Must register the secring for encryption because it is needed to figure out the default recipient. Reported by Roger Sondermann. --- g10/ChangeLog | 6 ++++++ g10/g10.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 91eabf8ec..74fff45ce 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2002-01-08 Werner Koch + + * g10.c (main): Must register the secring for encryption because + it is needed to figure out the default recipient. Reported by + Roger Sondermann. + 2002-01-05 David Shaw * keyedit.c (menu_adduid): Require --expert before adding a photo diff --git a/g10/g10.c b/g10/g10.c index 1c64516a7..b4690e720 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -1451,14 +1451,14 @@ main( int argc, char **argv ) /* Add the keyrings, but not for some special commands and not in case of "-kvv userid keyring". Also avoid adding the secret - keyring for a couple of commands to avaoid unneeded access in + keyring for a couple of commands to avoid unneeded access in case the secrings are stored on a floppy */ if( cmd != aDeArmor && cmd != aEnArmor && !(cmd == aKMode && argc == 2 ) ) { if (cmd != aCheckKeys && cmd != aListSigs && cmd != aListKeys && cmd != aVerify && cmd != aVerifyFiles - && cmd != aEncr && cmd != aSym) + && cmd != aSym) { if (!sec_nrings || default_keyring) /* add default secret rings */ keydb_add_resource ("secring" EXTSEP_S "gpg", 0, 1);