X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/52efac0f79343cd80f1b7815ea416fc4036aa54b..b7a8b5277d37b289361ff0cc881632f527e4d5db:/keydb.c

diff --git a/keydb.c b/keydb.c
index 42eebfe..c257eb5 100644
--- a/keydb.c
+++ b/keydb.c
@@ -1,9 +1,20 @@
 /*
  * keydb.c - Routines for DB access that just use store/fetch.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 /**
@@ -23,6 +34,7 @@
 #include "keystructs.h"
 #include "mem.h"
 #include "merge.h"
+#include "openpgp.h"
 #include "parsekey.h"
 #include "sendsync.h"
 
@@ -42,7 +54,7 @@ char *generic_keyid2uid(uint64_t keyid)
 			publickey != NULL) {
 		curuid = publickey->uids;
 		while (curuid != NULL && buf[0] == 0) {
-			if (curuid->packet->tag == 13) {
+			if (curuid->packet->tag == OPENPGP_PACKET_UID) {
 				snprintf(buf, 1023, "%.*s",
 						(int) curuid->packet->length,
 						curuid->packet->data);
@@ -150,7 +162,7 @@ uint64_t generic_getfullkeyid(uint64_t keyid)
 	if (keyid < 0x100000000LL) {
 		config.dbbackend->fetch_key(keyid, &publickey, false);
 		if (publickey != NULL) {
-			keyid = get_keyid(publickey);
+			get_keyid(publickey, &keyid);
 			free_publickey(publickey);
 			publickey = NULL;
 		} else {
@@ -181,13 +193,15 @@ int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
 	struct openpgp_publickey *prev = NULL;
 	int newkeys = 0;
 	bool intrans;
+	uint64_t keyid;
 
 	for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
 		intrans = config.dbbackend->starttrans();
+		get_keyid(curkey, &keyid);
 		logthing(LOGTHING_INFO,
-			"Fetching key 0x%llX, result: %d",
-			get_keyid(curkey),
-			config.dbbackend->fetch_key(get_keyid(curkey), &oldkey,
+			"Fetching key 0x%" PRIX64 ", result: %d",
+			keyid,
+			config.dbbackend->fetch_key(keyid, &oldkey,
 					intrans));
 
 		/*