Happy new year

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

diff --git a/servers/slapd/back-perl/close.c b/servers/slapd/back-perl/close.c
index 61c8f03e5bf05027dbeb6aa5d14b9b2e190a2513..8a4139a8ae9b8102de5d263e319ec473e524339b 100644 (file)
--- a/servers/slapd/back-perl/close.c
+++ b/servers/slapd/back-perl/close.c
@@ -1,24 +1,34 @@
-/*
- *      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-2004 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 <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined by both Perl and ac/localize.h */
+
+#ifdef HAVE_WIN32_ASPERL
+#include "asperl_undefs.h"
+#endif
+
 #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"
 
 /**********************************************************
@@ -34,7 +44,7 @@ perl_back_close(
 {
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
-       perl_destruct(perl_interpreter);
+       perl_destruct(PERL_INTERPRETER);
 
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );        
 
@@ -46,8 +56,8 @@ perl_back_destroy(
        BackendInfo *bd
 )
 {
-       perl_free(perl_interpreter);
-       perl_interpreter = NULL;
+       perl_free(PERL_INTERPRETER);
+       PERL_INTERPRETER = NULL;
 
        ldap_pvt_thread_mutex_destroy( &perl_interpreter_mutex );       
 
@@ -61,4 +71,6 @@ perl_back_db_destroy(
 {
        free( be->be_private );
        be->be_private = NULL;
+
+       return 0;
 }