X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=106617fa06f4924021837f7c4980f52153a1cf35;hb=ceb1c5ce1c22a1e062cf724d222b126751e2906a;hp=322362febf0e9d0f1d5e8eb9db2e56ec676f526a;hpb=3952bc8e95a2b21aced14f890028f12d00e191fa;p=openldap

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 322362febf..106617fa06 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -39,6 +39,9 @@ pthread_mutex_t	currenttime_mutex;
 int		active_threads;
 pthread_mutex_t	active_threads_mutex;
 pthread_mutex_t	new_conn_mutex;
+#ifdef SLAPD_CRYPT
+pthread_mutex_t crypt_mutex;
+#endif
 long		ops_initiated;
 long		ops_completed;
 int		num_conns;
@@ -120,7 +123,7 @@ main( int argc, char **argv )
 #endif
 
 		case 'f':	/* read config file */
-			configfile = strdup( optarg );
+			configfile = ch_strdup( optarg );
 			break;
 
 		case 'i':	/* run from inetd */
@@ -148,9 +151,9 @@ main( int argc, char **argv )
 	Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
 
 	if ( (myname = strrchr( argv[0], '/' )) == NULL ) {
-		myname = strdup( argv[0] );
+		myname = ch_strdup( argv[0] );
 	} else {
-		myname = strdup( myname + 1 );
+		myname = ch_strdup( myname + 1 );
 	}
 
 	if ( ! inetd ) {
@@ -172,37 +175,25 @@ main( int argc, char **argv )
 	read_config( configfile, &be, fp );
 
 	if ( ! inetd ) {
-		pthread_attr_t	attr;
 		int		status;
 
 		time( &starttime );
-		pthread_attr_init( &attr );
-		pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED );
-
-#if !defined(HAVE_PTHREADS_D4)
-		/* POSIX_THREADS or compatible
-		 * This is a draft 10 or standard pthreads implementation
-		 */
-		if ( pthread_create( &listener_tid, &attr, slapd_daemon,
-		    (void *) port ) != 0 ) {
-			Debug( LDAP_DEBUG_ANY,
-			    "listener pthread_create failed\n", 0, 0, 0 );
-			exit( 1 );
-		}
-#else	/* draft4 */
-		/*
-		 * This is a draft 4 or earlier pthreads implementation
-		 */
-		if ( pthread_create( &listener_tid, attr, slapd_daemon,
+
+		if ( pthread_create( &listener_tid, NULL, slapd_daemon,
 		    (void *) port ) != 0 ) {
 			Debug( LDAP_DEBUG_ANY,
 			    "listener pthread_create failed\n", 0, 0, 0 );
 			exit( 1 );
 		}
-#endif	/* !draft4 */
-		pthread_attr_destroy( &attr );
+
+#ifdef HAVE_PHREADS_FINAL
+		pthread_join( listener_tid, (void *) NULL );
+#else
 		pthread_join( listener_tid, (void *) &status );
-		pthread_exit( 0 );
+#endif
+
+		return 0;
+
 	} else {
 		Connection		c;
 		Operation		*o;
@@ -243,7 +234,7 @@ main( int argc, char **argv )
 			    inet_ntoa( from.sin_addr ), 0 );
 
 			c.c_addr = inet_ntoa( from.sin_addr );
-			c.c_domain = strdup( hp == NULL ? "" : hp->h_name );
+			c.c_domain = ch_strdup( hp == NULL ? "" : hp->h_name );
 		} else {
 			Debug( LDAP_DEBUG_ARGS, "connection from unknown\n",
 			    0, 0, 0 );
@@ -261,6 +252,7 @@ main( int argc, char **argv )
 				/* log and send error */
 				Debug( LDAP_DEBUG_ANY,
 				   "ber_get_int returns 0x%lx\n", tag, 0, 0 );
+				ber_free( &ber, 1 );
 				return 1;
 			}