From c25ee06f212172fa77ba8ae14c6de0b2e1c1210c Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Tue, 14 Jul 2020 23:49:16 +0000
Subject: fix a gcc truncation warning in md5calc

---
 src/elogin/md5calc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/elogin/md5calc.c b/src/elogin/md5calc.c
index d5dbed3..e2c9235 100644
--- a/src/elogin/md5calc.c
+++ b/src/elogin/md5calc.c
@@ -12,6 +12,8 @@
 #include <stdio.h>
 #include "mt_rand.h"
 
+#include "common/strlib.h"
+
 #ifndef UINT_MAX
 #define UINT_MAX 4294967295U
 #endif
@@ -324,6 +326,10 @@ char *MD5_saltcrypt(const char *key, const char *salt)
     // Hash the buffer back into sbuf
     MD5_String(buf, sbuf);
 
+    // explicitly truncate the hash to fit in obuf
+    int salt_len = (int)safestrnlen(salt, 30);
+    sbuf[30 - salt_len] = '\0';
+
     snprintf(obuf, 32, "!%s$%s", salt, sbuf);
     return(obuf);
 }
-- 
cgit v1.2.3-60-g2f50