Commit 4f72b1a1 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6214

parent 0325bc4f
...@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log ...@@ -3,6 +3,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.18 Engineering OpenLDAP 2.4.18 Engineering
Fixed slapd incorrectly applying writetimeout when not set (ITS#6220) Fixed slapd incorrectly applying writetimeout when not set (ITS#6220)
Fixed slapd subordinate needs a suffix (ITS#6216) Fixed slapd subordinate needs a suffix (ITS#6216)
Fixed slapd tools to properly close database (ITS#6214)
Fixed slapd-ndb startup (ITS#6203) Fixed slapd-ndb startup (ITS#6203)
Build Environment Build Environment
Fixed test056-monitor with custom ports (ITS#6213) Fixed test056-monitor with custom ports (ITS#6213)
......
...@@ -73,6 +73,7 @@ slapacl( int argc, char **argv ) ...@@ -73,6 +73,7 @@ slapacl( int argc, char **argv )
char *attr = NULL; char *attr = NULL;
int doclose = 0; int doclose = 0;
BackendDB *bd; BackendDB *bd;
void *thrctx;
slap_tool_init( progname, SLAPACL, argc, argv ); slap_tool_init( progname, SLAPACL, argc, argv );
...@@ -96,7 +97,8 @@ slapacl( int argc, char **argv ) ...@@ -96,7 +97,8 @@ slapacl( int argc, char **argv )
argv = &argv[ optind ]; argv = &argv[ optind ];
argc -= optind; argc -= optind;
connection_fake_init( &conn, &opbuf, &conn ); thrctx = ldap_pvt_thread_pool_context();
connection_fake_init( &conn, &opbuf, thrctx );
op = &opbuf.ob_op; op = &opbuf.ob_op;
op->o_tmpmemctx = NULL; op->o_tmpmemctx = NULL;
......
...@@ -83,13 +83,15 @@ slapauth( int argc, char **argv ) ...@@ -83,13 +83,15 @@ slapauth( int argc, char **argv )
Connection conn = {0}; Connection conn = {0};
OperationBuffer opbuf; OperationBuffer opbuf;
Operation *op; Operation *op;
void *thrctx;
slap_tool_init( progname, SLAPAUTH, argc, argv ); slap_tool_init( progname, SLAPAUTH, argc, argv );
argv = &argv[ optind ]; argv = &argv[ optind ];
argc -= optind; argc -= optind;
connection_fake_init( &conn, &opbuf, &conn ); thrctx = ldap_pvt_thread_pool_context();
connection_fake_init( &conn, &opbuf, thrctx );
op = &opbuf.ob_op; op = &opbuf.ob_op;
conn.c_sasl_bind_mech = mech; conn.c_sasl_bind_mech = mech;
......
...@@ -49,6 +49,7 @@ slapschema( int argc, char **argv ) ...@@ -49,6 +49,7 @@ slapschema( int argc, char **argv )
Connection conn = { 0 }; Connection conn = { 0 };
OperationBuffer opbuf; OperationBuffer opbuf;
Operation *op = NULL; Operation *op = NULL;
void *thrctx;
slap_tool_init( progname, SLAPCAT, argc, argv ); slap_tool_init( progname, SLAPCAT, argc, argv );
...@@ -78,7 +79,8 @@ slapschema( int argc, char **argv ) ...@@ -78,7 +79,8 @@ slapschema( int argc, char **argv )
exit( EXIT_FAILURE ); exit( EXIT_FAILURE );
} }
connection_fake_init( &conn, &opbuf, &conn ); thrctx = ldap_pvt_thread_pool_context();
connection_fake_init( &conn, &opbuf, thrctx );
op = &opbuf.ob_op; op = &opbuf.ob_op;
op->o_tmpmemctx = NULL; op->o_tmpmemctx = NULL;
op->o_bd = be; op->o_bd = be;
......
Supports Markdown
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