From: Jonathan McDowell Date: Mon, 12 Aug 2019 17:59:54 +0000 (+0100) Subject: Fix up key deletion by key ID with onak tool X-Git-Tag: onak-0.6.0~37 X-Git-Url: https://the.earth.li/gitweb/?a=commitdiff_plain;h=35be219c978ea1869cd6dae4649478e2d503a7b6;p=onak.git Fix up key deletion by key ID with onak tool The call to db_delete_key() was claiming we were in a transaction, which isn't true and causes failures with deletion with DB4. --- diff --git a/onak.c b/onak.c index 384b674..f4ece8f 100644 --- a/onak.c +++ b/onak.c @@ -389,11 +389,11 @@ int main(int argc, char *argv[]) } else if (!strcmp("delete", argv[optind])) { if (!isfp) { if (dbctx->fetch_key_id(dbctx, keyid, &keys, - true)) { + false)) { get_fingerprint(keys->publickey, &fingerprint); dbctx->delete_key(dbctx, &fingerprint, - true); + false); } } else dbctx->delete_key(dbctx, &fingerprint, false);