X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_pg.c;h=480f1f1d34541831c6e3fd414785867d0a2c3ed1;hb=f8e9e43f90418ec6c8b5768a7981cbdabb64b198;hp=8e0543b9f061210c5afda582f889d1d0009156cc;hpb=5e1b22d763640c4d7a09d07920403d8d491b4410;p=onak.git

diff --git a/keydb_pg.c b/keydb_pg.c
index 8e0543b..480f1f1 100644
--- a/keydb_pg.c
+++ b/keydb_pg.c
@@ -369,12 +369,18 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans,
 	char *primary = NULL;
 	char *safeuid = NULL;
 	int i;
+	uint64_t keyid;
 
 	if (!intrans) {
 		result = PQexec(dbconn, "BEGIN");
 		PQclear(result);
 	}
 
+	if (get_keyid(publickey, &keyid) != ONAK_E_OK) {
+		logthing(LOGTHING_ERROR, "Couldn't find key ID for key.");
+		return 0;
+	}
+
 	/*
 	 * Delete the key if we already have it.
 	 *
@@ -384,7 +390,7 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans,
 	 * it definitely needs updated.
 	 */
 	if (update) {
-		pg_delete_key(get_keyid(publickey), true);
+		pg_delete_key(keyid, true);
 	}
 
 	next = publickey->next;
@@ -406,7 +412,7 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans,
 	snprintf(statement, 1023, 
 			"INSERT INTO onak_keys (keyid, keydata) VALUES "
 			"('%" PRIX64 "', '%d')", 
-			get_keyid(publickey),
+			keyid,
 			key_oid);
 	result = PQexec(dbconn, statement);
 
@@ -429,7 +435,7 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans,
 					"INSERT INTO onak_uids "
 					"(keyid, uid, pri) "
 					"VALUES	('%" PRIX64 "', '%s', '%c')",
-					get_keyid(publickey),
+					keyid,
 					safeuid,
 					(uids[i] == primary) ? 't' : 'f');
 				result = PQexec(dbconn, statement);
@@ -464,7 +470,7 @@ static int pg_store_key(struct openpgp_publickey *publickey, bool intrans,
 				"INSERT INTO onak_sigs (signer, signee) "
 				"VALUES ('%" PRIX64 "', '%" PRIX64 "')",
 				sig_keyid(packets->packet),
-				get_keyid(publickey));
+				keyid);
 			result = PQexec(dbconn, statement);
 			PQclear(result);
 		}