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 ec105f95430f8318d87c1eebd82fa7edd9433a69..f15e6fc0b685abab6111a1c647c2f5bb06ac52eb 100644 (file)
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -1,30 +1,27 @@
 /* $OpenLDAP$ */
-/*
- *      Copyright 1999, John C. Quillan, All rights reserved.
- *      Portions Copyright 2002, myinternet Limited. All rights reserved.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *      Redistribution and use in source and binary forms are permitted only
- *      as authorized by the OpenLDAP Public License.  A copy of this
- *      license is available at http://www.OpenLDAP.org/license.html or
- *      in file LICENSE in the top-level directory of the distribution.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
+ * Portions Copyright 1999 John C. Quillan.
+ * Portions Copyright 2002 myinternet Limited.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-#include "portable.h"
- /* init.c - initialize shell backend */
-       
-#include <stdio.h>
-
-#include "slap.h"
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include <EXTERN.h>
-#include <XSUB.h>
-#include <perl.h>
-
 #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));
@@ -32,22 +29,6 @@ EXT void boot_DynaLoader LDAP_P((PERL_BACK_BOOT_DYNALOADER_PARAMS));
 PerlInterpreter *PERL_INTERPRETER = NULL;
 ldap_pvt_thread_mutex_t        perl_interpreter_mutex;
 
-#ifdef SLAPD_PERL_DYNAMIC
-
-int back_perl_LTX_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;
-}
-
-#endif /* SLAPD_PERL_DYNAMIC */
-
 
 /**********************************************************
  *
@@ -60,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;
@@ -98,28 +72,39 @@ perl_back_initialize(
 
        bi->bi_extended = 0;
 
-       bi->bi_acl_group = 0;
-       bi->bi_acl_attribute = 0;
        bi->bi_chk_referrals = 0;
 
        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) );
@@ -129,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;
@@ -152,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;
 
@@ -176,9 +160,18 @@ perl_back_db_open(
 
 
 static void
-perl_back_xs_init()
+perl_back_xs_init(PERL_BACK_XS_INIT_PARAMS)
 {
        char *file = __FILE__;
        dXSUB_SYS;
        newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
 }
+
+#if SLAPD_PERL == SLAPD_MOD_DYNAMIC
+
+/* conditionally define the init_module() function */
+SLAP_BACKEND_INIT_MODULE( perl )
+
+#endif /* SLAPD_PERL == SLAPD_MOD_DYNAMIC */
+
+