Fix transaction around id32 updating in DB4 backend.

For some reason we finished our transaction before we wrote the id32db
details. Fix this so we do it afterwards instead.

diff --git a/keydb_db4.c b/keydb_db4.c
index 0d7b46b935de0dd422b7e4cea340aada5b726be1..0163ed53ea5bfdfb9cfb72c6e8a0b50d0cf7d6ca 100644 (file)
--- a/keydb_db4.c
+++ b/keydb_db4.c
@@ -638,10 +638,6 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
                uids = NULL;
        }
 
                uids = NULL;
        }
 

-       if (!intrans) {
-               endtrans();
-       }
-

        /*
         * Write the truncated 32 bit keyid so we can lookup the full id for
         * queries.
        /*
         * Write the truncated 32 bit keyid so we can lookup the full id for
         * queries.


@@ -704,6 +700,10 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
                }
        }
 
                }
        }
 

+       if (!intrans) {
+               endtrans();
+       }
+

        return deadlock ? -1 : 0 ;
 }
 
        return deadlock ? -1 : 0 ;
 }