Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5

doc/guide/preamble.sdf

@@ -91,7 +91,7 @@ ________________<BR>
 <P>
 <FONT COLOR="#808080" FACE="Arial,Verdana,Helvetica" SIZE="1"><B>
 ________________<BR>
-<SMALL>&copy; Copyright 2011, <A HREF="https://www.OpenLDAP.org/foundation/">OpenLDAP Foundation</A>, <A HREF="mailto:info@OpenLDAP.org">info@OpenLDAP.org</A></SMALL></B></FONT>
+<SMALL>&copy; Copyright 2011-2021, <A HREF="https://www.OpenLDAP.org/foundation/">OpenLDAP Foundation</A>, <A HREF="mailto:info@OpenLDAP.org">info@OpenLDAP.org</A></SMALL></B></FONT>
 
 	!endblock
 !endmacro

servers/slapd/connection.c

@@ -520,7 +520,12 @@ Connection * connection_init(
 		BER_BVZERO( &c->c_peer_name );
 
 		ber_sockbuf_free( c->c_sb );
-		c->c_sb = NULL;
+		c->c_sb = ber_sockbuf_alloc( );
+		{
+			ber_len_t max = sockbuf_max_incoming;
+			ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
+		}
+
 		c->c_sd = AC_SOCKET_INVALID;
 		ldap_pvt_thread_mutex_unlock( &c->c_mutex );