X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=17625baf59eed00909e2d39849e1f3aa20d50ebd;hb=d2f1c427f8860f48db9a74af46f5909edc4fceb7;hp=ad86cb04bef6ff829c78034030ae314ccdb005f4;hpb=99e631a4e7aa7a22d7c9ff0797f4ce690decd92a;p=onak.git

diff --git a/onak.c b/onak.c
index ad86cb0..17625ba 100644
--- a/onak.c
+++ b/onak.c
@@ -207,7 +207,7 @@ int main(int argc, char *argv[])
 	if ((argc - optind) < 1) {
 		usage();
 	} else if (!strcmp("dump", argv[optind])) {
-		dbctx = config.dbinit(true);
+		dbctx = config.dbinit(config.backend, true);
 		dumpstate.count = dumpstate.filenum = 0;
 		dumpstate.maxcount = 100000;
 		dumpstate.fd = -1;
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
 			logthing(LOGTHING_INFO, "%d keys cleaned.",
 					result);
 
-			dbctx = config.dbinit(false);
+			dbctx = config.dbinit(config.backend, false);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
 					dbctx->update_keys(dbctx, &keys,
 					false));
@@ -318,6 +318,13 @@ int main(int argc, char *argv[])
 			free_publickey(keys);
 			keys = NULL;
 		}
+	} else if (!strcmp("dumpconfig", argv[optind])) {
+		if ((argc - optind) == 2) {
+			writeconfig(argv[optind + 1]);
+		} else {
+			/* Dump config to stdout */
+			writeconfig(NULL);
+		}
 	} else if ((argc - optind) == 2) {
 		search = argv[optind+1];
 		if (search != NULL && strlen(search) == 42 &&
@@ -330,14 +337,14 @@ int main(int argc, char *argv[])
 			}
 			isfp = true;
 		} else if (search != NULL) {
-			keyid = strtoul(search, &end, 16);
+			keyid = strtouq(search, &end, 16);
 			if (*search != 0 &&
 					end != NULL &&
 					*end == 0) {
 				ishex = true;
 			}
 		}
-		dbctx = config.dbinit(false);
+		dbctx = config.dbinit(config.backend, false);
 		if (!strcmp("index", argv[optind])) {
 			find_keys(dbctx, search, keyid, &fingerprint, ishex,
 					isfp, dispfp, skshash,
@@ -444,6 +451,7 @@ int main(int argc, char *argv[])
 
 	cleanuplogthing();
 	cleanupconfig();
+	free(configfile);
 
 	return rc;
 }