Clean up a couple of format truncation warnings

Newer GCCs will warn about truncation in strncpy/snprintf etc, so re-jig
things a bit to try and avoid it.

diff --git a/keyd.c b/keyd.c
index c1c2d5080d280d30b3e6f9f83db7a533e5f58d2a..ad06e6aae77037b23697a78ac8835c0f03684bf0 100644 (file)
--- a/keyd.c
+++ b/keyd.c
@@ -609,7 +609,7 @@ int main(int argc, char *argv[])
 {
        int fd = -1, maxfd, i, clients[MAX_CLIENTS];
        fd_set rfds = { 0 }; /* Avoid scan-build false report for FD_SET */
-       char sockname[1024];
+       char sockname[100];
        char *configfile = NULL;
        bool foreground = false;
        int optchar;
@@ -655,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) {

diff --git a/keydb_hkp.c b/keydb_hkp.c
index d55551e5724273ccf17fa44c232cb88e71c0dabc..1465503ed87518be37ea9e045075e8fc07c6dfa1 100644 (file)
--- a/keydb_hkp.c
+++ b/keydb_hkp.c
@@ -36,7 +36,7 @@
 struct onak_hkp_dbctx {
        struct onak_db_config *config; /* Our DB config info */
        CURL *curl;
-       char hkpbase[1024];
+       char hkpbase[512];
 };
 
 static int hkp_parse_url(struct onak_hkp_dbctx *privctx, const char *url)