projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add revoked/bare public key signed keys
[onak.git]
/
keydb_dynamic.c
diff --git
a/keydb_dynamic.c
b/keydb_dynamic.c
index 68ee44956ccf23feac9b16a7faa0c75c74ffff80..49d77b85e110743b93308460e1587fafe22b239c 100644
(file)
--- a/
keydb_dynamic.c
+++ b/
keydb_dynamic.c
@@
-46,11
+46,11
@@
bool load_backend(void)
if (config.backends_dir == NULL) {
soname = malloc(strlen(config.db_backend)
if (config.backends_dir == NULL) {
soname = malloc(strlen(config.db_backend)
- + strlen("/libkeydb_")
+ + strlen("
.
/libkeydb_")
+ strlen(".so")
+ 1);
+ strlen(".so")
+ 1);
- sprintf(soname, "libkeydb_%s.so", config.db_backend);
+ sprintf(soname, "
./
libkeydb_%s.so", config.db_backend);
} else {
soname = malloc(strlen(config.db_backend)
+ strlen("/libkeydb_")
} else {
soname = malloc(strlen(config.db_backend)
+ strlen("/libkeydb_")
@@
-203,7
+203,7
@@
struct ll *getkeysigs(uint64_t keyid, bool *revoked)
sigs = keysigs(sigs, uids->sigs);
}
if (revoked != NULL) {
sigs = keysigs(sigs, uids->sigs);
}
if (revoked != NULL) {
- *revoked =
(publickey->revocations != NULL)
;
+ *revoked =
publickey->revoked
;
}
free_publickey(publickey);
}
}
free_publickey(publickey);
}
@@
-342,7
+342,7
@@
int update_keys(struct openpgp_publickey **keys, bool sendsync)
*/
if (oldkey != NULL) {
merge_keys(oldkey, curkey);
*/
if (oldkey != NULL) {
merge_keys(oldkey, curkey);
- if (curkey->
revocation
s == NULL &&
+ if (curkey->
sig
s == NULL &&
curkey->uids == NULL &&
curkey->subkeys == NULL) {
if (prev == NULL) {
curkey->uids == NULL &&
curkey->subkeys == NULL) {
if (prev == NULL) {