X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keyd.c;h=aa58b8a734edd3dc5b83e5e9cbdbb18dd68c821f;hb=2826e0222d6ad5148384d5d39ea748277093ab21;hp=6a171d43b3f575e8b92b17c2f96c6b33f0b8ff97;hpb=5c137b7d6af54fb54dfe13b65c933b5b6a4c764c;p=onak.git

diff --git a/keyd.c b/keyd.c
index 6a171d4..aa58b8a 100644
--- a/keyd.c
+++ b/keyd.c
@@ -606,7 +606,7 @@ static void usage(void)
 int main(int argc, char *argv[])
 {
 	int fd = -1, maxfd, i, clients[MAX_CLIENTS];
-	fd_set rfds;
+	fd_set rfds = { 0 }; /* Avoid scan-build false report for FD_SET */
 	char sockname[1024];
 	char *configfile = NULL;
 	bool foreground = false;
@@ -653,7 +653,7 @@ int main(int argc, char *argv[])
 	}
 	stats->started = time(NULL);
 
-	snprintf(sockname, 1023, "%s/%s", config.db_dir, KEYD_SOCKET);
+	snprintf(sockname, 1023, "%s/%s", config.sock_dir, KEYD_SOCKET);
 	fd = sock_init(sockname);
 
 	if (fd != -1) {
@@ -662,7 +662,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) {