X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydctl.c;h=8712f6361d00978817f42f717989e3f545ebb18d;hb=d623a1b8e656cc5f45b360b402dfc974c711c8d3;hp=ef942dbd92d78635d1b31b5f6a78ccd021fc7ddf;hpb=83ae316a7b14e55418349e87d1a1942a0627ae14;p=onak.git
diff --git a/keydctl.c b/keydctl.c
index ef942db..8712f63 100644
--- a/keydctl.c
+++ b/keydctl.c
@@ -13,8 +13,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 .
*/
#include
@@ -27,12 +26,10 @@
#include
#include
+#include "build-config.h"
+
#include "keyd.h"
#include "onak-conf.h"
-#include "version.h"
-
-/* HACK: We need to stop onak-conf.o requiring this. */
-void *DBINIT = NULL;
static int keyd_fd = -1;
static int verbose = 0;
@@ -99,7 +96,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) {
@@ -175,10 +172,14 @@ static void keyd_status(void)
stats.command_stats[KEYD_CMD_GET_ID]);
printf(" Get key by FP: %d\n",
stats.command_stats[KEYD_CMD_GET_FP]);
+ printf(" Get key by hash: %d\n",
+ stats.command_stats[KEYD_CMD_GET_SKSHASH]);
printf(" Store key: %d\n",
stats.command_stats[KEYD_CMD_STORE]);
printf(" Delete key: %d\n",
stats.command_stats[KEYD_CMD_DELETE]);
+ printf(" Update key: %d\n",
+ stats.command_stats[KEYD_CMD_UPDATE]);
printf(" Search key: %d\n",
stats.command_stats[KEYD_CMD_GET_TEXT]);
printf(" Get full keyid: %d\n",