X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydctl.c;h=47492c59e26c887474cf125b6024cea1a3de2bf5;hb=8e0907be1d73011075a99a0c029c56664e12843e;hp=11e5e8f3ae4fdfe0aaba40a8f20afab618a31cc5;hpb=5c274b5843f4446515b7b941593d4f643ce1a456;p=onak.git

diff --git a/keydctl.c b/keydctl.c
index 11e5e8f..47492c5 100644
--- a/keydctl.c
+++ b/keydctl.c
@@ -32,7 +32,7 @@
 #include "version.h"
 
 /* HACK: We need to stop onak-conf.o requiring this. */
-void *DBFUNCS = NULL;
+void *DBINIT = NULL;
 
 static int keyd_fd = -1;
 static int verbose = 0;
@@ -164,13 +164,16 @@ static void keyd_status(void)
 	printf("Command statistics:\n");
 	printf("  Version:          %d\n",
 		stats.command_stats[KEYD_CMD_VERSION]);
-	printf("  Get key:          %d\n", stats.command_stats[KEYD_CMD_GET]);
+	printf("  Get key by ID:    %d\n",
+		stats.command_stats[KEYD_CMD_GET_ID]);
+	printf("  Get key by FP:    %d\n",
+		stats.command_stats[KEYD_CMD_GET_FP]);
 	printf("  Store key:        %d\n",
 		stats.command_stats[KEYD_CMD_STORE]);
 	printf("  Delete key:       %d\n",
 		stats.command_stats[KEYD_CMD_DELETE]);
 	printf("  Search key:       %d\n",
-		stats.command_stats[KEYD_CMD_GETTEXT]);
+		stats.command_stats[KEYD_CMD_GET_TEXT]);
 	printf("  Get full keyid:   %d\n",
 		stats.command_stats[KEYD_CMD_GETFULLKEYID]);
 	printf("  Iterate all keys: %d\n",
@@ -220,6 +223,7 @@ int main(int argc, char *argv[])
 	configfile = NULL;
 
 	if ((argc - optind) < 1) {
+		cleanupconfig();
 		usage();
 	} else if (!strcmp("check", argv[optind])) {
 		/* Just do the connect and close quietly */
@@ -235,9 +239,11 @@ int main(int argc, char *argv[])
 		keyd_do_command(KEYD_CMD_QUIT, NULL, 0);
 		keyd_close();
 	} else {
+		cleanupconfig();
 		usage();
 	}
 
+	cleanupconfig();
 
 	exit(EXIT_SUCCESS);
 }