From 0fd7cd7b7b0e9f93935bcbcc4dfcba737095a4a1 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Thu, 14 Aug 2008 20:09:49 +0000
Subject: [PATCH] reinit properly

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@510 a93c3328-9c30-0410-af19-c9cd2b2d52af
---
 libs/openzap/src/zap_io.c   | 4 ++++
 libs/openzap/src/zap_pika.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/libs/openzap/src/zap_io.c b/libs/openzap/src/zap_io.c
index 52211d8fb1..c92083f914 100644
--- a/libs/openzap/src/zap_io.c
+++ b/libs/openzap/src/zap_io.c
@@ -2102,6 +2102,8 @@ zap_status_t zap_global_init(void)
 {
 	int modcount;
 
+	memset(&globals, 0, sizeof(globals));
+
 	time_init();
 	zap_isdn_init();
 	zap_ss7_boost_init();
@@ -2224,6 +2226,8 @@ zap_status_t zap_global_destroy(void)
 	hashtable_destroy(globals.interface_hash, 0, 0);
 	zap_mutex_unlock(globals.mutex);
 	zap_mutex_destroy(&globals.mutex);
+
+	memset(&globals, 0, sizeof(globals));
 	return ZAP_SUCCESS;
 }
 
diff --git a/libs/openzap/src/zap_pika.c b/libs/openzap/src/zap_pika.c
index 310cf5b1c1..ffe79e397c 100644
--- a/libs/openzap/src/zap_pika.c
+++ b/libs/openzap/src/zap_pika.c
@@ -1330,6 +1330,8 @@ zap_status_t pika_destroy(void)
 	if ((status = PKH_SYSTEM_Close(globals.system_handle)) != PK_SUCCESS) {
 		zap_log(ZAP_LOG_ERROR, "Error: PKH_SYSTEM_Close failed(%s)!\n",
 				PKH_ERROR_GetText(status, error_text, sizeof(error_text)));
+	} else {
+		zap_log(ZAP_LOG_INFO, "Closing system handle\n");
 	}
 
 	hashtable_destroy(globals.profile_hash, 0, 1);