From: Howard Chu <hyc@openldap.org>
Date: Wed, 19 Nov 2003 09:02:37 +0000 (+0000)
Subject: Minor cleanups for ITS#2620 from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_1_24~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8290d9bb5e73f7b614003f4f667513750eeb80e;p=thirdparty%2Fopenldap.git

Minor cleanups for ITS#2620 from HEAD
---

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 2315ad5c79..3d659b34dd 100644
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -288,6 +288,10 @@ stop:
     /* destroy the thread package */
     ldap_pvt_thread_destroy();
 
+#ifdef HAVE_TLS
+    ldap_pvt_tls_destroy();
+#endif
+
 #ifdef NEW_LOGGING
 	LDAP_LOG ( SLURPD, RESULTS, "main: slurpd terminated\n", 0, 0, 0 );
 #else
diff --git a/servers/slurpd/ri.c b/servers/slurpd/ri.c
index a614c4e2f6..090c188531 100644
--- a/servers/slurpd/ri.c
+++ b/servers/slurpd/ri.c
@@ -169,6 +169,10 @@ Ri_process(
 	re = new_re;
 	rq->rq_unlock( rq );
 	if ( sglob->slurpd_shutdown ) {
+	    if ( ri->ri_ldp ) { 
+	    	ldap_unbind( ri->ri_ldp );
+		ri->ri_ldp = NULL;
+	    }
 	    return 0;
 	}
     }