From c07882446d1f6a830cb4d008bf9d20d3b38a7023 Mon Sep 17 00:00:00 2001
From: Jonathan McDowell <noodles@earth.li>
Date: Mon, 31 May 2004 23:47:18 +0000
Subject: [PATCH] cscvs to tla changeset 44 Author: noodles Date: 2002/11/22
18:57:05 Fixed bug with merging keys that have no new information.
---
merge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
--
2.39.5