X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=89c2ec7ba04e5f779ef87c56863b1dd3d919b622;hb=5719b2b50c87d77e4ed1cc054f000845fc9aa8cc;hp=0c4673d7704323723c53133b9cc429f2700bd5c9;hpb=3648a31750b3b42197c404483a18ca63d5f8777b;p=onak.git

diff --git a/onak.c b/onak.c
index 0c4673d..89c2ec7 100644
--- a/onak.c
+++ b/onak.c
@@ -15,8 +15,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <fcntl.h>
@@ -207,7 +206,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 +237,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 +317,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 &&
@@ -337,7 +343,7 @@ int main(int argc, char *argv[])
 				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 +450,7 @@ int main(int argc, char *argv[])
 
 	cleanuplogthing();
 	cleanupconfig();
+	free(configfile);
 
 	return rc;
 }