From 7cbc893caf0a36e6f4e48c51d3d1da5c95e7100a Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 12 Dec 2002 22:02:53 +0000 Subject: [PATCH] * options.skel: Include the required '=' sign in the sample 'group' option. * import.c (chk_self_sigs): Don't try and check a subkey as if it was a signature. --- g10/ChangeLog | 8 ++++++++ g10/import.c | 1 + g10/options.skel | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 463a8229a..4e55c5742 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2002-12-12 David Shaw + + * options.skel: Include the required '=' sign in the sample + 'group' option. + + * import.c (chk_self_sigs): Don't try and check a subkey as if it + was a signature. + 2002-12-11 David Shaw * mainproc.c (proc_tree): Handle multiple detached sigs diff --git a/g10/import.c b/g10/import.c index fa8c44049..a7a296174 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1037,6 +1037,7 @@ chk_self_sigs( const char *fname, KBNODE keyblock, rsdate=0; bsnode=NULL; rsnode=NULL; + continue; } else if( n->pkt->pkttype != PKT_SIGNATURE ) continue; diff --git a/g10/options.skel b/g10/options.skel index cbb7cdf82..ce44448ee 100644 --- a/g10/options.skel +++ b/g10/options.skel @@ -63,7 +63,7 @@ $Id$ #charset utf-8 # Group names may be defined like this: -# group mynames paige 0x12345678 joe patti +# group mynames = paige 0x12345678 joe patti # # Any time "mynames" is a recipient (-r or --recipient), it will be # expanded to the names "paige", "joe", and "patti", and the key ID @@ -72,7 +72,7 @@ $Id$ # if there are spaces in the recipient name, this will appear as two # recipients. In these cases it is better to use the key ID. -#group mynames paige 0x12345678 joe patti +#group mynames = paige 0x12345678 joe patti # Lock the file only once for the lifetime of a process. If you do # not define this, the lock will be obtained and released every time