Skip to content
Snippets Groups Projects
Commit 4f2d6dd1 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

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

parents e2acb7c7 6ee53d50
No related branches found
Tags OPENLDAP_REL_ENG_2_5_1ALPHA
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/guide/preamble.sdf
+ 1
− 1
View file @ 4f2d6dd1
...@@ -91,7 +91,7 @@ ________________<BR> ...@@ -91,7 +91,7 @@ ________________<BR>
<P> <P>
<FONT COLOR="#808080" FACE="Arial,Verdana,Helvetica" SIZE="1"><B> <FONT COLOR="#808080" FACE="Arial,Verdana,Helvetica" SIZE="1"><B>
________________<BR> ________________<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 !endblock
!endmacro !endmacro
......
servers/slapd/connection.c
+ 6
− 1
View file @ 4f2d6dd1
...@@ -520,7 +520,12 @@ Connection * connection_init( ...@@ -520,7 +520,12 @@ Connection * connection_init(
BER_BVZERO( &c->c_peer_name ); BER_BVZERO( &c->c_peer_name );
ber_sockbuf_free( c->c_sb ); 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; c->c_sd = AC_SOCKET_INVALID;
ldap_pvt_thread_mutex_unlock( &c->c_mutex ); ldap_pvt_thread_mutex_unlock( &c->c_mutex );
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment