[389-commits] Branch '389-ds-base-1.3.2' - ldap/servers

[Noriko Hosoi]

 ldap/servers/slapd/libglobs.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit c65fcdcef8d277273d85a00835d063eeaa22123b
Author: Mark Reynolds <mreynolds at redhat.com>
Date:   Wed Nov 27 14:59:14 2013 -0500

    Ticket 47457 - default nsslapd-sasl-max-buffer-size should be 2MB
    
    Description:  Increase the default max buffer size to 2mb from 64k.
    
    https://fedorahosted.org/389/ticket/47457
    
    Reviewed by: richm(Thanks!)
    
    (cherry picked from commit 846447c62e3ad2150b054c87c96e797dc1d803f3)

diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index 94144c8..691b6f5 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -183,8 +183,9 @@ static int invalid_sasl_mech(char *str);
 #define DEFAULT_PW_RESETFAILURECOUNT "600"
 #define DEFAULT_PW_LOCKDURATION "3600"
 #define DEFAULT_NDN_SIZE "20971520"
-#define DEFAULT_SASL_MAXBUFSIZE "65536"
-#define SLAPD_DEFAULT_SASL_MAXBUFSIZE 65536
+#define DEFAULT_MAXBERSIZE 2097152
+#define DEFAULT_SASL_MAXBUFSIZE "2097152"
+#define SLAPD_DEFAULT_SASL_MAXBUFSIZE 2097152
 #ifdef MEMPOOL_EXPERIMENTAL
 #define DEFAULT_MEMPOOL_MAXFREELIST "1024"
 #endif
@@ -5707,9 +5708,9 @@ config_get_maxbersize()
 
     maxbersize = slapdFrontendConfig->maxbersize;
     if(maxbersize==0)
-        maxbersize= 2 * 1024 * 1024; /* Default: 2Mb */
-    return maxbersize;
+        maxbersize = DEFAULT_MAXBERSIZE;
 
+    return maxbersize;
 }
 
 int