X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Finit.c;h=f15e6fc0b685abab6111a1c647c2f5bb06ac52eb;hb=9547dd7a0d9fd079e6e75fb59b20a2fc661c9782;hp=ff3b589ab94ced951cfe0e9b8a71c88b20a286ed;hpb=9c550e7235830af9d031d8d7ba86b87f36dcc99f;p=openldap
diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index ff3b589ab9..f15e6fc0b6 100644
--- 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 .
*
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
* Portions Copyright 1999 John C. Quillan.
* Portions Copyright 2002 myinternet Limited.
* All rights reserved.
@@ -16,7 +16,12 @@
*/
#include "perl_back.h"
-#include "external.h"
+#include "../config.h"
+
+#ifdef PERL_SYS_INIT3
+#include /* maybe get environ */
+extern char **environ;
+#endif
static void perl_back_xs_init LDAP_P((PERL_BACK_XS_INIT_PARAMS));
EXT void boot_DynaLoader LDAP_P((PERL_BACK_BOOT_DYNALOADER_PARAMS));
@@ -36,25 +41,18 @@ perl_back_initialize(
BackendInfo *bi
)
{
- 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);
+ char *embedding[] = { "", "-e", "0", NULL }, **argv = embedding;
+ int argc = 3;
+#ifdef PERL_SYS_INIT3
+ char **env = environ;
+#else
+ char **env = NULL;
+#endif
- 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 +77,34 @@ 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 );
- return 0;
+
+#ifdef PERL_SYS_INIT3
+ PERL_SYS_INIT3(&argc, &argv, &env);
+#endif
+ PERL_INTERPRETER = perl_alloc();
+ perl_construct(PERL_INTERPRETER);
+#ifdef PERL_EXIT_DESTRUCT_END
+ PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
+#endif
+ perl_parse(PERL_INTERPRETER, perl_back_xs_init, argc, argv, env);
+ perl_run(PERL_INTERPRETER);
+ return perl_back_init_cf( bi );
}
int
perl_back_db_init(
- BackendDB *be
+ BackendDB *be,
+ ConfigReply *cr
)
{
be->be_private = (PerlBackend *) ch_malloc( sizeof(PerlBackend) );
@@ -103,12 +114,15 @@ perl_back_db_init(
Debug( LDAP_DEBUG_TRACE, "perl backend db init\n", 0, 0, 0 );
+ be->be_cf_ocs = be->bd_info->bi_cf_ocs;
+
return 0;
}
int
perl_back_db_open(
- BackendDB *be
+ BackendDB *be,
+ ConfigReply *cr
)
{
int count;
@@ -126,11 +140,7 @@ perl_back_db_open(
PUTBACK;
-#ifdef PERL_IS_5_6
count = call_method("init", G_SCALAR);
-#else
- count = perl_call_method("init", G_SCALAR);
-#endif
SPAGAIN;
@@ -159,20 +169,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 */