ITS#4358

diff --git a/CHANGES b/CHANGES
index 7ae19ae3c1691c70b0cc723661168c18d77def31..d29493ab97876ad3b7fc6da027e9d2df67c6f6fd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,8 @@ OpenLDAP 2.3.28 Engineering
        Fixed slapd global access controls initialization (ITS#4654)
        Fixed slapd setting c_sasl_bindop only on SASL binds
        Fixed slapd-perl deletes (ITS#2612)
+       Fixed slapd-perl backend initialization (ITS#4358)
+       Fixed slapd-perl finding interpreter inside a thread (ITS#4358)
 
 OpenLDAP 2.3.27 Release
        Fixed libldap dangling pointer issue (previous fix was broken) (ITS#4405)

diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c
index 11d59261fb9c3405c0c3e8be6c98cb779957112b..72e418746e0903360f2518168091e31ab9abe96b 100644 (file)
--- a/servers/slapd/back-perl/bind.c
+++ b/servers/slapd/back-perl/bind.c
@@ -32,7 +32,7 @@ perl_back_bind(
 
        PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
 
-#ifdef HAVE_WIN32_ASPERL
+#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
        PERL_SET_CONTEXT( PERL_INTERPRETER );
 #endif
 

diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index 5a4cd7d0508ce321efc16926781bbc17c064e242..526953a9ad4741b4846d77280cfb4382e3b743fc 100644 (file)
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -35,7 +35,9 @@ perl_back_initialize(
        BackendInfo     *bi
 )
 {
-       bi->bi_open = perl_back_open;
+       char *embedding[] = { "", "-e", "0" };
+
+       bi->bi_open = NULL;
        bi->bi_config = 0;
        bi->bi_close = perl_back_close;
        bi->bi_destroy = 0;
@@ -63,16 +65,7 @@ perl_back_initialize(
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
 
-       return 0;
-}
-               
-int
-perl_back_open(
-       BackendInfo     *bi
-)
-{
-       char *embedding[] = { "", "-e", "0" };
-
+       /* injecting code from perl_back_open, because using fonction reference  (bi->bi_open) is not functional */
        Debug( LDAP_DEBUG_TRACE, "perl backend open\n", 0, 0, 0 );
 
        if( PERL_INTERPRETER != NULL ) {

diff --git a/servers/slapd/back-perl/proto-perl.h b/servers/slapd/back-perl/proto-perl.h
index e16c3a81c6d04c27efadb4607ace91ac58429fcf..a2d464ab7a0f338fbd5e987a574ef961af5d97f6 100644 (file)
--- a/servers/slapd/back-perl/proto-perl.h
+++ b/servers/slapd/back-perl/proto-perl.h
@@ -22,7 +22,6 @@ LDAP_BEGIN_DECL
 
 extern BI_init         perl_back_initialize;
 
-extern BI_open         perl_back_open;
 extern BI_close                perl_back_close;
 
 extern BI_db_init      perl_back_db_init;