fix ITS#5959 fix

[openldap] / servers / slapd / back-perl / init.c

diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index ff3b589ab94ced951cfe0e9b8a71c88b20a286ed..74e2dd052c31e37ba1603609d9a0fb9ed1b62068 100644 (file)
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2009 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -16,7 +16,7 @@
  */
 
 #include "perl_back.h"
-#include "external.h"
+#include "../config.h"
 
 static void perl_back_xs_init LDAP_P((PERL_BACK_XS_INIT_PARAMS));
 EXT void boot_DynaLoader LDAP_P((PERL_BACK_BOOT_DYNALOADER_PARAMS));
@@ -38,23 +38,10 @@ perl_back_initialize(
 {
        char *embedding[] = { "", "-e", "0" };
 
-       Debug( LDAP_DEBUG_TRACE, "perl backend open\n", 0, 0, 0 );
-
-       if( PERL_INTERPRETER != NULL ) {
-               Debug( LDAP_DEBUG_ANY, "perl backend open: already opened\n",
-                       0, 0, 0 );
-               return 1;
-       }
-       
-       PERL_INTERPRETER = perl_alloc();
-       perl_construct(PERL_INTERPRETER);
-       perl_parse(PERL_INTERPRETER, perl_back_xs_init, 3, embedding, (char **)NULL);
-       perl_run(PERL_INTERPRETER);
-
-       bi->bi_open = perl_back_open;
+       bi->bi_open = NULL;
        bi->bi_config = 0;
        bi->bi_close = perl_back_close;
-       bi->bi_destroy = perl_back_destroy;
+       bi->bi_destroy = 0;
 
        bi->bi_db_init = perl_back_db_init;
        bi->bi_db_config = perl_back_db_config;
@@ -79,21 +66,28 @@ perl_back_initialize(
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
 
-       return 0;
-}
-               
-int
-perl_back_open(
-       BackendInfo     *bi
-)
-{
+       /* 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 ) {
+               Debug( LDAP_DEBUG_ANY, "perl backend open: already opened\n",
+                       0, 0, 0 );
+               return 1;
+       }
+       
        ldap_pvt_thread_mutex_init( &perl_interpreter_mutex );
+
+       PERL_INTERPRETER = perl_alloc();
+       perl_construct(PERL_INTERPRETER);
+       perl_parse(PERL_INTERPRETER, perl_back_xs_init, 3, embedding, (char **)NULL);
+       perl_run(PERL_INTERPRETER);
        return 0;
 }
 
 int
 perl_back_db_init(
-       BackendDB       *be
+       BackendDB       *be,
+       ConfigReply     *cr
 )
 {
        be->be_private = (PerlBackend *) ch_malloc( sizeof(PerlBackend) );
@@ -108,7 +102,8 @@ perl_back_db_init(
 
 int
 perl_back_db_open(
-       BackendDB       *be
+       BackendDB       *be,
+       ConfigReply     *cr
 )
 {
        int count;
@@ -159,20 +154,9 @@ perl_back_xs_init(PERL_BACK_XS_INIT_PARAMS)
 
 #if SLAPD_PERL == SLAPD_MOD_DYNAMIC
 
-int
-init_module( int argc, char *argv[] )
-{
-       BackendInfo bi;
-
-       memset( &bi, '\0', sizeof( bi ) );
-       bi.bi_type = "perl";
-       bi.bi_init = perl_back_initialize;
-
-       backend_add( &bi );
-
-       return 0;
-}
+/* conditionally define the init_module() function */
+SLAP_BACKEND_INIT_MODULE( perl )
 
-#endif /* SLAPD_PERL */
+#endif /* SLAPD_PERL == SLAPD_MOD_DYNAMIC */