From: Howard Chu <hyc@openldap.org>
Date: Tue, 23 Jun 2009 23:12:15 +0000 (+0000)
Subject: ITS#5658 hppa fixes
X-Git-Tag: ACLCHECK_0~483
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d3aae2dc427d1fd1bef8d236cde39524cbc35396;p=openldap

ITS#5658 hppa fixes
---

diff --git a/servers/slapd/back-perl/close.c b/servers/slapd/back-perl/close.c
index 48fd480eb8..24263b04ae 100644
--- a/servers/slapd/back-perl/close.c
+++ b/servers/slapd/back-perl/close.c
@@ -31,6 +31,9 @@ perl_back_close(
 	perl_destruct(PERL_INTERPRETER);
 	perl_free(PERL_INTERPRETER);
 	PERL_INTERPRETER = NULL;
+#ifdef PERL_SYS_TERM
+	PERL_SYS_TERM();
+#endif
 
 	ldap_pvt_thread_mutex_destroy( &perl_interpreter_mutex );	
 
diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index 74e2dd052c..c461bb2d47 100644
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -37,6 +37,7 @@ perl_back_initialize(
 )
 {
 	char *embedding[] = { "", "-e", "0" };
+	int argc = 3;
 
 	bi->bi_open = NULL;
 	bi->bi_config = 0;
@@ -77,9 +78,15 @@ perl_back_initialize(
 	
 	ldap_pvt_thread_mutex_init( &perl_interpreter_mutex );
 
+#ifdef PERL_SYS_INIT3
+	PERL_SYS_INIT3(&argc, &embedding, (char **)NULL);
+#endif
 	PERL_INTERPRETER = perl_alloc();
 	perl_construct(PERL_INTERPRETER);
-	perl_parse(PERL_INTERPRETER, perl_back_xs_init, 3, embedding, (char **)NULL);
+#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_run(PERL_INTERPRETER);
 	return 0;
 }