X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=gpgwww.c;h=07b448e37eff10cac7d40b211bafd1b576d91c5e;hb=cab77e4ffc25ba4fb2e5289beaa47c7d915de942;hp=fa898683061e22c7ac3628679b3f9bff30d2a9e4;hpb=8fc32ce43451185ca899b65ceec273425a358f00;p=onak.git

diff --git a/gpgwww.c b/gpgwww.c
index fa89868..07b448e 100644
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -1,9 +1,20 @@
 /*
  * gpgwww.c - www interface to path finder.
- * 
- * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2001-2002 Project Purple.
+ * Copyright 2001-2004 Jonathan McDowell <noodles@earth.li>
+ *
+ * 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.
  */
 
 #include <inttypes.h>
@@ -58,7 +69,6 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
 	struct openpgp_packet_list *list_end = NULL;
 	struct stats_key *keyinfoa, *keyinfob, *curkey;
 	uint64_t fullhave, fullwant;
-	int rec;
 	int pathlen = 0;
 
 	fullhave = config.dbbackend->getfullkeyid(have);
@@ -82,7 +92,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
 		 * Fill the tree info up.
 		 */
 		initcolour(true);
-		rec = findpath(keyinfoa, keyinfob);
+		findpath(keyinfoa, keyinfob);
 		keyinfob->parent = 0;
 		if (keyinfoa->colour == 0) {
 			pathlen = count;
@@ -94,7 +104,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
 			curkey = findinhash(keyinfoa->parent);
 			while (curkey != NULL && curkey->keyid != 0) {
 	    			if (curkey->keyid != fullwant &&
-						config.dbbackend->fetch_key(
+						config.dbbackend->fetch_key_id(
 						curkey->keyid,
 						&publickey, false)) {
 	      				flatten_publickey(publickey,
@@ -115,7 +125,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
 	/*
 	 * Add the destination key to the list of returned keys.
 	 */
-	if (config.dbbackend->fetch_key(fullwant, &publickey, false)) {
+	if (config.dbbackend->fetch_key_id(fullwant, &publickey, false)) {
 		flatten_publickey(publickey,
 				&packets,
 				&list_end);