summaryrefslogtreecommitdiffstats
path: root/g10/keyedit.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2000-07-25 17:38:12 +0200
committerWerner Koch <wk@gnupg.org>2000-07-25 17:38:12 +0200
commitb872ea2577bb68fc29d126cf79900d88d55ba268 (patch)
tree8464add6c2571724cf174d25b45a7cd05778eed0 /g10/keyedit.c
parentSee ChangeLog: Mon Jul 17 16:35:47 CEST 2000 Werner Koch (diff)
downloadgnupg2-b872ea2577bb68fc29d126cf79900d88d55ba268.tar.xz
gnupg2-b872ea2577bb68fc29d126cf79900d88d55ba268.zip
See ChangeLog: Tue Jul 25 17:44:15 CEST 2000 Werner Koch
Diffstat (limited to 'g10/keyedit.c')
-rw-r--r--g10/keyedit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c
index a64c7e86f..daf4fb41d 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1504,7 +1504,7 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
else if( node->pkt->pkttype == PKT_USER_ID )
uid = node->pkt->pkt.user_id;
else if( main_pk && node->pkt->pkttype == PKT_SIGNATURE
- && sub_pk != NULL ) {
+ && (mainkey || sub_pk ) ) {
PKT_signature *sig = node->pkt->pkt.signature;
if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
&& ( (mainkey && uid && (sig->sig_class&~3) == 0x10)