Minor cleanups for ITS#2620 from HEAD

diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 2315ad5c790dcbca1245705fe211b43718c2ae06..3d659b34dd6b5daea6a130171dd2a77787066b45 100644 (file)
--- 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 a614c4e2f66ffc0d74536dd9a5c127463424cf00..090c188531b1e85ffe779cc3c4c9553d0b612f02 100644 (file)
--- 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;
        }
     }