fix previous commit

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

diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index e3e41d8c727b2a24929d224fa1b996e0790fbb00..fef6b782a9bda0338a8d53e6504017a52812d2dc 100644 (file)
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -1,29 +1,26 @@
-/*
- *      Copyright 1999, John C. Quillan, All rights reserved.
+/* $OpenLDAP$ */
+/* 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-2005 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 <ac/types.h>
-       #include <ac/socket.h>
-*/
-
-#include <EXTERN.h>
-#include <perl.h>
-
-
-#include "slap.h"
 #include "perl_back.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));
 
-PerlInterpreter *perl_interpreter = NULL;
+PerlInterpreter *PERL_INTERPRETER = NULL;
 ldap_pvt_thread_mutex_t        perl_interpreter_mutex;
 
 
@@ -42,41 +39,44 @@ perl_back_initialize(
 
        Debug( LDAP_DEBUG_TRACE, "perl backend open\n", 0, 0, 0 );
 
-       if( perl_interpreter != NULL ) {
+       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, NULL, 3, embedding, (char **)NULL);
-       perl_run(perl_interpreter);
+       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_config = NULL;
+       bi->bi_config = 0;
        bi->bi_close = perl_back_close;
        bi->bi_destroy = perl_back_destroy;
 
        bi->bi_db_init = perl_back_db_init;
        bi->bi_db_config = perl_back_db_config;
-       bi->bi_db_open = NULL;
-       bi->bi_db_close = NULL;
+       bi->bi_db_open = perl_back_db_open;
+       bi->bi_db_close = 0;
        bi->bi_db_destroy = perl_back_db_destroy;
 
        bi->bi_op_bind = perl_back_bind;
-       bi->bi_op_unbind = perl_back_unbind;
+       bi->bi_op_unbind = 0;
        bi->bi_op_search = perl_back_search;
        bi->bi_op_compare = perl_back_compare;
        bi->bi_op_modify = perl_back_modify;
        bi->bi_op_modrdn = perl_back_modrdn;
        bi->bi_op_add = perl_back_add;
        bi->bi_op_delete = perl_back_delete;
-       bi->bi_op_abandon = NULL;
+       bi->bi_op_abandon = 0;
 
-#ifdef SLAPD_ACLGROUPS
-       bi->bi_acl_group = NULL;
-#endif
+       bi->bi_extended = 0;
+
+       bi->bi_chk_referrals = 0;
+
+       bi->bi_connection_init = 0;
+       bi->bi_connection_destroy = 0;
 
        return 0;
 }
@@ -92,14 +92,75 @@ perl_back_open(
 
 int
 perl_back_db_init(
-       Backend *be
+       BackendDB       *be
 )
 {
        be->be_private = (PerlBackend *) ch_malloc( sizeof(PerlBackend) );
-       memset(&be->be_private, 0, sizeof(PerlBackend));
+       memset( be->be_private, '\0', sizeof(PerlBackend));
+
+       ((PerlBackend *)be->be_private)->pb_filter_search_results = 0;
 
        Debug( LDAP_DEBUG_TRACE, "perl backend db init\n", 0, 0, 0 );
 
        return 0;
 }
 
+int
+perl_back_db_open(
+       BackendDB       *be
+)
+{
+       int count;
+       int return_code;
+
+       PerlBackend *perl_back = (PerlBackend *) be->be_private;
+
+       ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
+
+       {
+               dSP; ENTER; SAVETMPS;
+
+               PUSHMARK(sp);
+               XPUSHs( perl_back->pb_obj_ref );
+
+               PUTBACK;
+
+#ifdef PERL_IS_5_6
+               count = call_method("init", G_SCALAR);
+#else
+               count = perl_call_method("init", G_SCALAR);
+#endif
+
+               SPAGAIN;
+
+               if (count != 1) {
+                       croak("Big trouble in perl_back_db_open\n");
+               }
+
+               return_code = POPi;
+
+               PUTBACK; FREETMPS; LEAVE;
+       }
+
+       ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );
+
+       return return_code;
+}
+
+
+static void
+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 */
+
+