From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 6 Apr 1999 20:59:30 +0000 (+0000)
Subject: Remove HAVE_LWP use from slurpd.  globals for ldap_pvt_thread_sleep()
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~236
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=539a7dbf343fcaedea9e4b83f3ed5357a94f1a82;p=openldap

Remove HAVE_LWP use from slurpd.  globals for ldap_pvt_thread_sleep()
need to be managed completely by -lldap_r.
---

diff --git a/servers/slurpd/globals.c b/servers/slurpd/globals.c
index fed3bbf31d..34593f6585 100644
--- a/servers/slurpd/globals.c
+++ b/servers/slurpd/globals.c
@@ -68,10 +68,6 @@ init_globals( void )
 #ifdef HAVE_KERBEROS
     g->default_srvtab = SRVTAB;
 #endif /* HAVE_KERBEROS */
-#if defined( HAVE_LWP )
-    g->tsl_list = NULL;
-    mon_create( &g->tsl_mon ); 
-#endif /* HAVE_LWP */
 
     return g;
 }
diff --git a/servers/slurpd/globals.h b/servers/slurpd/globals.h
index 46c854e663..955ce6467a 100644
--- a/servers/slurpd/globals.h
+++ b/servers/slurpd/globals.h
@@ -58,10 +58,6 @@ typedef struct globals {
     /* Default name of kerberos srvtab file */
     char *default_srvtab;
 #endif /* HAVE_KERBEROS */
-#if defined( HAVE_LWP )  && !defined( HAVE_THR )
-    tl_t *tsl_list;
-    mon_t tsl_mon;
-#endif /* THREAD_SUNOS4_LWP */
 } Globals;
 
 
diff --git a/servers/slurpd/re.c b/servers/slurpd/re.c
index 00b22eace3..d58b58cb65 100644
--- a/servers/slurpd/re.c
+++ b/servers/slurpd/re.c
@@ -80,10 +80,9 @@ Re_free(
 		"Warning: freeing re (dn: %s) with nonzero refcnt\n",
 		re->re_dn, 0, 0 );
     }
-#if !defined( HAVE_LWP )
-    /* This seems to have problems under SunOS lwp */
+
     ldap_pvt_thread_mutex_destroy( &re->re_mutex );
-#endif /* HAVE_LWP */
+
     ch_free( re->re_timestamp );
     if (( rh = re->re_replicas ) != NULL ) {
 	for ( i = 0; rh[ i ].rh_hostname != NULL; i++ ) {