projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start pulling non-library material out of core source files
[onak.git]
/
keydb_dynamic.c
diff --git
a/keydb_dynamic.c
b/keydb_dynamic.c
index 10bec165e6decd21c6820095fd6f21abfd0057fa..65373860461243548727048858493850d2a597d7 100644
(file)
--- a/
keydb_dynamic.c
+++ b/
keydb_dynamic.c
@@
-393,7
+393,7
@@
static uint64_t dynamic_getfullkeyid(uint64_t keyid)
if (keyid < 0x100000000LL) {
dynamic_fetch_key(keyid, &publickey, false);
if (publickey != NULL) {
if (keyid < 0x100000000LL) {
dynamic_fetch_key(keyid, &publickey, false);
if (publickey != NULL) {
-
keyid = get_keyid(publickey
);
+
get_keyid(publickey, &keyid
);
free_publickey(publickey);
publickey = NULL;
} else {
free_publickey(publickey);
publickey = NULL;
} else {
@@
-422,6
+422,7
@@
static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync)
struct openpgp_publickey *prev = NULL;
int newkeys = 0;
bool intrans;
struct openpgp_publickey *prev = NULL;
int newkeys = 0;
bool intrans;
+ uint64_t keyid;
if (loaded_backend == NULL) {
load_backend();
if (loaded_backend == NULL) {
load_backend();
@@
-435,10
+436,11
@@
static int dynamic_update_keys(struct openpgp_publickey **keys, bool sendsync)
for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
intrans = dynamic_starttrans();
for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
intrans = dynamic_starttrans();
+ get_keyid(curkey, &keyid);
logthing(LOGTHING_INFO,
"Fetching key 0x%" PRIX64 ", result: %d",
logthing(LOGTHING_INFO,
"Fetching key 0x%" PRIX64 ", result: %d",
-
get_keyid(curkey)
,
- dynamic_fetch_key(
get_keyid(curkey)
, &oldkey, intrans));
+
keyid
,
+ dynamic_fetch_key(
keyid
, &oldkey, intrans));
/*
* If we already have the key stored in the DB then merge it
/*
* If we already have the key stored in the DB then merge it