X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=717402ee41137e0e90aa6862d87c8a4396d3f552;hb=8ee9a59daf7a1ab1bf4ad8f4d2bcb88282db58a8;hp=f4ece8f2150b2eb9f0795a271e7edf98ffc8c55f;hpb=35be219c978ea1869cd6dae4649478e2d503a7b6;p=onak.git

diff --git a/onak.c b/onak.c
index f4ece8f..717402e 100644
--- a/onak.c
+++ b/onak.c
@@ -234,14 +234,18 @@ int main(int argc, char *argv[])
 			logthing(LOGTHING_INFO, "Finished reading %d keys.",
 					result);
 
-			result = cleankeys(&keys, config.clean_policies);
+			dbctx = config.dbinit(config.backend, false);
+			result = cleankeys(dbctx, &keys,
+					config.clean_policies);
 			logthing(LOGTHING_INFO, "%d keys cleaned.",
 					result);
 
-			dbctx = config.dbinit(config.backend, false);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
 					dbctx->update_keys(dbctx, &keys,
-					false));
+						&config.blacklist,
+						(config.clean_policies &
+						 ONAK_CLEAN_UPDATE_ONLY),
+						false));
 			if (keys != NULL && update) {
 				flatten_publickey(keys,
 					&packets,
@@ -272,6 +276,7 @@ int main(int argc, char *argv[])
 			logthing(LOGTHING_NOTICE, "No changes.");
 		}
 	} else if (!strcmp("clean", argv[optind])) {
+		dbctx = config.dbinit(config.backend, true);
 		if (binary) {
 			result = read_openpgp_stream(stdin_getchar, NULL,
 				 &packets, 0);
@@ -289,7 +294,7 @@ int main(int argc, char *argv[])
 					result);
 
 			if (keys != NULL) {
-				result = cleankeys(&keys,
+				result = cleankeys(dbctx, &keys,
 						config.clean_policies);
 				logthing(LOGTHING_INFO, "%d keys cleaned.",
 						result);
@@ -319,6 +324,7 @@ int main(int argc, char *argv[])
 			free_publickey(keys);
 			keys = NULL;
 		}
+		dbctx->cleanupdb(dbctx);
 	} else if (!strcmp("dumpconfig", argv[optind])) {
 		if ((argc - optind) == 2) {
 			writeconfig(argv[optind + 1]);
@@ -394,6 +400,8 @@ int main(int argc, char *argv[])
 							&fingerprint);
 					dbctx->delete_key(dbctx, &fingerprint,
 							false);
+					free_publickey(keys);
+					keys = NULL;
 				}
 			} else
 				dbctx->delete_key(dbctx, &fingerprint, false);
@@ -457,7 +465,7 @@ int main(int argc, char *argv[])
 			if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
 				get_fingerprint(keys->publickey, &fingerprint);
 				dbctx->delete_key(dbctx, &fingerprint, true);
-				cleankeys(&keys, config.clean_policies);
+				cleankeys(dbctx, &keys, config.clean_policies);
 				dbctx->store_key(dbctx, keys, true, false);
 			} else {
 				puts("Key not found");