dovecot-2.2: *-login: Also increase MASTER_AUTH_MAX_DATA_SIZE an...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/53613f102450
changeset: 18046:53613f102450
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Oct 30 04:41:11 2014 +0200
description:
*-login: Also increase MASTER_AUTH_MAX_DATA_SIZE and add a check to make sure it's large enough.

diffstat:

 src/imap-login/client.c      |  4 ++++
 src/lib-master/master-auth.h |  2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r 0a5bd3b09ca5 -r 53613f102450 src/imap-login/client.c
--- a/src/imap-login/client.c	Thu Oct 30 04:36:50 2014 +0200
+++ b/src/imap-login/client.c	Thu Oct 30 04:41:11 2014 +0200
@@ -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 -r 0a5bd3b09ca5 -r 53613f102450 src/lib-master/master-auth.h
--- a/src/lib-master/master-auth.h	Thu Oct 30 04:36:50 2014 +0200
+++ b/src/lib-master/master-auth.h	Thu Oct 30 04:41:11 2014 +0200
@@ -18,7 +18,7 @@
    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."