Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index bb0d16f2e4849b97940abbc51fcb5ddbb5234211..f15e6fc0b685abab6111a1c647c2f5bb06ac52eb 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-2011 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -18,6 +18,11 @@
 #include "perl_back.h"
 #include "../config.h"
 
+#ifdef PERL_SYS_INIT3
+#include <ac/unistd.h>         /* 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,8 +41,13 @@ perl_back_initialize(
        BackendInfo     *bi
 )
 {
-       char *embedding[] = { "", "-e", "0" };
+       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 = NULL;
        bi->bi_config = 0;
@@ -79,14 +89,14 @@ perl_back_initialize(
        ldap_pvt_thread_mutex_init( &perl_interpreter_mutex );
 
 #ifdef PERL_SYS_INIT3
-       PERL_SYS_INIT3(&argc, &embedding, (char ***)NULL);
+       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, embedding, (char **)NULL);
+       perl_parse(PERL_INTERPRETER, perl_back_xs_init, argc, argv, env);
        perl_run(PERL_INTERPRETER);
        return perl_back_init_cf( bi );
 }
@@ -130,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;