mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-01-03 13:40:37 -05:00
ITS#6214 use the main thread's context so cleanup can occur
This commit is contained in:
parent
553f0f2ffd
commit
e08e89d6a7
3 changed files with 9 additions and 3 deletions
|
|
@ -73,6 +73,7 @@ slapacl( int argc, char **argv )
|
|||
char *attr = NULL;
|
||||
int doclose = 0;
|
||||
BackendDB *bd;
|
||||
void *thrctx;
|
||||
|
||||
slap_tool_init( progname, SLAPACL, argc, argv );
|
||||
|
||||
|
|
@ -96,7 +97,8 @@ slapacl( int argc, char **argv )
|
|||
argv = &argv[ 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->o_tmpmemctx = NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -83,13 +83,15 @@ slapauth( int argc, char **argv )
|
|||
Connection conn = {0};
|
||||
OperationBuffer opbuf;
|
||||
Operation *op;
|
||||
void *thrctx;
|
||||
|
||||
slap_tool_init( progname, SLAPAUTH, argc, argv );
|
||||
|
||||
argv = &argv[ 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;
|
||||
|
||||
conn.c_sasl_bind_mech = mech;
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ slapschema( int argc, char **argv )
|
|||
Connection conn = { 0 };
|
||||
OperationBuffer opbuf;
|
||||
Operation *op = NULL;
|
||||
void *thrctx;
|
||||
|
||||
slap_tool_init( progname, SLAPCAT, argc, argv );
|
||||
|
||||
|
|
@ -78,7 +79,8 @@ slapschema( int argc, char **argv )
|
|||
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->o_tmpmemctx = NULL;
|
||||
op->o_bd = be;
|
||||
|
|
|
|||
Loading…
Reference in a new issue