aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyedit.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>1998-09-18 15:24:53 +0000
committerWerner Koch <[email protected]>1998-09-18 15:24:53 +0000
commitb4aeef458c51b9debd394592e76b93cc6b00e0a2 (patch)
treee87818f5c15e12189f5fc054faf6d09e07e3d120 /g10/keyedit.c
parentMichael Roth has released is des impl. (diff)
downloadgnupg-b4aeef458c51b9debd394592e76b93cc6b00e0a2.tar.gz
gnupg-b4aeef458c51b9debd394592e76b93cc6b00e0a2.zip
.
Diffstat (limited to '')
-rw-r--r--g10/keyedit.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 2b3a02023..13fa24c8c 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -85,6 +85,9 @@ get_keyblock_byname( KBNODE *keyblock, KBPOS *kbpos, const char *username )
rc = read_keyblock( kbpos, keyblock );
if( rc )
log_error("%s: keyblock read problem: %s\n", username, g10_errstr(rc));
+ else
+ merge_keys_and_selfsig( *keyblock );
+
return rc;
}
@@ -490,6 +493,7 @@ keyedit_menu( const char *username, STRLIST locusr )
username, g10_errstr(rc));
goto leave;
}
+ merge_keys_and_selfsig( sec_keyblock );
}
/* and now get the public key */