From: Jonathan McDowell <noodles@earth.li>
Date: Mon, 31 May 2004 23:47:18 +0000 (+0000)
Subject: cscvs to tla changeset 44
X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/c07882446d1f6a830cb4d008bf9d20d3b38a7023?ds=sidebyside;hp=8bb45b1dfe6b5b30d89f154c16fb3eb8c049f496

cscvs to tla changeset 44
Author: noodles
Date: 2002/11/22 18:57:05
Fixed bug with merging keys that have no new information.
---

diff --git a/merge.c b/merge.c
index cfe2d97..8d870a2 100644
--- a/merge.c
+++ b/merge.c
@@ -394,9 +394,9 @@ int update_keys(struct openpgp_publickey **keys, bool verbose)
 					*keys = curkey->next;
 				} else {
 					prev->next = curkey->next;
-					prev = curkey->next;
 					curkey->next = NULL;
 					free_publickey(curkey);
+					curkey = prev;
 				}
 			} else {
 				prev = curkey;