X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydctl.c;h=1aa5d59e4ccfe09dbe2bbc36baac9315bf54b163;hb=f46771092d60993b448f422920fa3afec1a3e9ec;hp=5a2ac212b96be129cab52b173b48d8737e26757a;hpb=2f9af5d673891e566b306bf4e00970e3df0ea01d;p=onak.git

diff --git a/keydctl.c b/keydctl.c
index 5a2ac21..1aa5d59 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;
@@ -99,7 +99,7 @@ static void keyd_connect(void)
 
 	sock.sun_family = AF_UNIX;
 	snprintf(sock.sun_path, sizeof(sock.sun_path) - 1, "%s/%s",
-			config.db_dir,
+			config.sock_dir,
 			KEYD_SOCKET);
 	if (connect(keyd_fd, (struct sockaddr *) &sock, sizeof(sock)) < 0) {
 		if (verbose >= 0) {
@@ -154,23 +154,33 @@ static void keyd_status(void)
 	uint32_t reply;
 	struct keyd_stats stats;
 
-	keyd_do_command(KEYD_CMD_VERSION, &reply, sizeof(reply));
+	if (keyd_do_command(KEYD_CMD_VERSION, &reply, sizeof(reply)) == -1) {
+		printf("Got failure asking for keyd version.\n");
+		return;
+	}
 	printf("Using keyd protocol version %d.\n", reply);
 
-	keyd_do_command(KEYD_CMD_STATS, &stats, sizeof(stats));
+	if (keyd_do_command(KEYD_CMD_STATS, &stats, sizeof(stats)) == -1) {
+		printf("Got failure asking for keyd statistics.\n");
+		return;
+	}
+
 	printf("keyd running since %s", ctime(&stats.started));
 	printf("%d client connections received\n", stats.connects);
 
 	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",