--- libaitmqtt/src/conn.c	2012/06/28 11:06:17	1.3
+++ libaitmqtt/src/conn.c	2022/09/13 20:37:21	1.3.12.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: conn.c,v 1.3 2012/06/28 11:06:17 misho Exp $
+* $Id: conn.c,v 1.3.12.1 2022/09/13 20:37:21 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -78,16 +78,19 @@ mqtt_msgCONNECT(mqtt_msg_t * __restrict buf, const cha
 
 	if (!buf || !csConnID)
 		return -1;
-	if (strlen(csConnID) > 23) {
-		mqtt_SetErr(EINVAL, "Invalid argument ConnID is too long (max 23 bytes)");
+	if (strlen(csConnID) >= MQTT_CONNID_MAX) {
+		mqtt_SetErr(EINVAL, "Invalid argument ConnID is too long (max %d bytes)", 
+				MQTT_CONNID_MAX - 1);
 		return -1;
 	}
-	if (csUser && strlen(csUser) > 12) {
-		mqtt_SetErr(EINVAL, "Invalid argument Username is too long (max 12 bytes)");
+	if (csUser && strlen(csUser) >= MQTT_CRED_MAX) {
+		mqtt_SetErr(EINVAL, "Invalid argument Username is too long (max %d bytes)", 
+				MQTT_CRED_MAX - 1);
 		return -1;
 	}
-	if (csPass && strlen(csPass) > 12) {
-		mqtt_SetErr(EINVAL, "Invalid argument Password is too long (max 12 bytes)");
+	if (csPass && strlen(csPass) >= MQTT_CRED_MAX) {
+		mqtt_SetErr(EINVAL, "Invalid argument Password is too long (max %d bytes)", 
+				MQTT_CRED_MAX - 1);
 		return -1;
 	}
 	if (WillQOS > MQTT_QOS_EXACTLY) {