From: Timo Sirainen <tss@iki.fi>
Date: Thu, 30 Oct 2014 02:41:11 +0000 (+0200)
Subject: *-login: Also increase MASTER_AUTH_MAX_DATA_SIZE and add a check to make sure it... 
X-Git-Tag: 2.2.16.rc1~260
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84e4f27dd10c56cd63d75a04af5f5eb2a1b70d22;p=thirdparty%2Fdovecot%2Fcore.git

*-login: Also increase MASTER_AUTH_MAX_DATA_SIZE and add a check to make sure it's large enough.
---

diff --git a/src/imap-login/client.c b/src/imap-login/client.c
index b8db333b76..487f341df0 100644
--- a/src/imap-login/client.c
+++ b/src/imap-login/client.c
@@ -23,6 +23,10 @@
 
 #include <stdlib.h>
 
+#if LOGIN_MAX_INBUF_SIZE < 1024+2
+#  error LOGIN_MAX_INBUF_SIZE too short to fit all ID command parameters
+#endif
+
 /* maximum length for IMAP command line. */
 #define MAX_IMAP_LINE 8192
 
diff --git a/src/lib-master/master-auth.h b/src/lib-master/master-auth.h
index 831d053bd7..fbf7538f32 100644
--- a/src/lib-master/master-auth.h
+++ b/src/lib-master/master-auth.h
@@ -18,7 +18,7 @@ struct master_service;
    values may be max. 1024 bytes plus 2 for "" quotes. (Although it could be
    even double of that when value is full of \" quotes, but for now lets not
    make it too easy to waste memory..) */
-#define MASTER_AUTH_MAX_DATA_SIZE (1024 + 128 + 33 + 2)
+#define MASTER_AUTH_MAX_DATA_SIZE (1024 + 128 + 64 + 2)
 
 #define MASTER_AUTH_ERRMSG_INTERNAL_FAILURE \
 	"Internal error occurred. Refer to server log for more information."