X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_pg.c;h=04c760dfbf9759cca2e60241f1fdaeac1f2f8bb3;hb=c04c1c60469823c01268187ec49102d1ff540806;hp=480f1f1d34541831c6e3fd414785867d0a2c3ed1;hpb=f8e9e43f90418ec6c8b5768a7981cbdabb64b198;p=onak.git diff --git a/keydb_pg.c b/keydb_pg.c index 480f1f1..04c760d 100644 --- a/keydb_pg.c +++ b/keydb_pg.c @@ -131,7 +131,7 @@ static void pg_endtrans(void) } /** - * fetch_key - Given a keyid fetch the key from storage. + * fetch_key_id - Given a keyid fetch the key from storage. * @keyid: The keyid to fetch. * @publickey: A pointer to a structure to return the key in. * @intrans: If we're already in a transaction. @@ -142,7 +142,8 @@ static void pg_endtrans(void) * in and then parse_keys() to parse the packets into a publickey * structure. */ -static int pg_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey, +static int pg_fetch_key_id(uint64_t keyid, + struct openpgp_publickey **publickey, bool intrans) { struct openpgp_packet_list *packets = NULL; @@ -655,6 +656,7 @@ static int pg_iterate_keys(void (*iterfunc)(void *ctx, */ #define NEED_GETFULLKEYID 1 #define NEED_UPDATEKEYS 1 +#define NEED_GET_FP 1 #include "keydb.c" struct dbfuncs keydb_pg_funcs = { @@ -662,7 +664,8 @@ struct dbfuncs keydb_pg_funcs = { .cleanupdb = pg_cleanupdb, .starttrans = pg_starttrans, .endtrans = pg_endtrans, - .fetch_key = pg_fetch_key, + .fetch_key_id = pg_fetch_key_id, + .fetch_key_fp = generic_fetch_key_fp, .fetch_key_text = pg_fetch_key_text, .store_key = pg_store_key, .update_keys = generic_update_keys,