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 cfe2d97d1c2711bfbb74d79eeba4b2d37f498c0f..8d870a22ced90791037d3bfd0d5f33410de09237 100644 (file)
--- 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;
                                        *keys = curkey->next;
                                } else {
                                        prev->next = curkey->next;

-                                       prev = curkey->next;

                                        curkey->next = NULL;
                                        free_publickey(curkey);
                                        curkey->next = NULL;
                                        free_publickey(curkey);

+                                       curkey = prev;

                                }
                        } else {
                                prev = curkey;
                                }
                        } else {
                                prev = curkey;