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 c461bb2d478752e7d9a9fc17ea42ca81f4c05ec9..392084233ffcae1af33b4359b10c63b45c84901a 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-2009 The OpenLDAP Foundation.
+ * Copyright 1999-2011 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -79,7 +79,7 @@ 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, &embedding, (char ***)NULL);
 #endif
        PERL_INTERPRETER = perl_alloc();
        perl_construct(PERL_INTERPRETER);
@@ -88,7 +88,7 @@ perl_back_initialize(
 #endif
        perl_parse(PERL_INTERPRETER, perl_back_xs_init, argc, embedding, (char **)NULL);
        perl_run(PERL_INTERPRETER);
-       return 0;
+       return perl_back_init_cf( bi );
 }
 
 int
@@ -104,6 +104,8 @@ 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;
 }
 
@@ -128,11 +130,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;