X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keyd.c;h=ad06e6aae77037b23697a78ac8835c0f03684bf0;hb=f98869fbb272a11751a1477e083898b8d41c94c6;hp=b73ff28ffec05758f774d3f235335b3a33c3381c;hpb=338e91f33174edebe42d77843c0eea34f53bc53c;p=onak.git diff --git a/keyd.c b/keyd.c index b73ff28..ad06e6a 100644 --- a/keyd.c +++ b/keyd.c @@ -397,6 +397,7 @@ static int sock_do(struct onak_dbctx *dbctx, int fd) } break; case KEYD_CMD_STORE: + case KEYD_CMD_UPDATE: if (!keyd_write_reply(fd, KEYD_REPLY_OK)) { ret = 1; } @@ -427,7 +428,8 @@ static int sock_do(struct onak_dbctx *dbctx, int fd) &packets, 0); parse_keys(packets, &key); - dbctx->store_key(dbctx, key, false, false); + dbctx->store_key(dbctx, key, false, + (cmd == KEYD_CMD_UPDATE)); free_packet_list(packets); packets = NULL; free_publickey(key); @@ -606,8 +608,8 @@ static void usage(void) int main(int argc, char *argv[]) { int fd = -1, maxfd, i, clients[MAX_CLIENTS]; - fd_set rfds; - char sockname[1024]; + fd_set rfds = { 0 }; /* Avoid scan-build false report for FD_SET */ + char sockname[100]; char *configfile = NULL; bool foreground = false; int optchar; @@ -653,7 +655,8 @@ int main(int argc, char *argv[]) } stats->started = time(NULL); - snprintf(sockname, 1023, "%s/%s", config.sock_dir, KEYD_SOCKET); + snprintf(sockname, sizeof(sockname) - 1, "%s/%s", + config.sock_dir, KEYD_SOCKET); fd = sock_init(sockname); if (fd != -1) { @@ -662,7 +665,7 @@ int main(int argc, char *argv[]) maxfd = fd; memset(clients, -1, sizeof (clients)); - dbctx = config.dbinit(false); + dbctx = config.dbinit(config.backend, false); logthing(LOGTHING_NOTICE, "Accepting connections."); while (!cleanup() && select(maxfd + 1, &rfds, NULL, NULL, NULL) != -1) {