From: Howard Chu <hyc@openldap.org>
Date: Tue, 21 Aug 2012 20:22:19 +0000 (-0700)
Subject: ITS#7358 fix ITS#7270 patch
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=68c3cf97954bbe7eb8a673fcd4d05ed4cae05c42;p=openldap

ITS#7358 fix ITS#7270 patch

commit 8bb9e88d5f8731fe73c47ba3eb8812a410dbb85c breaks Visual C
(as well as our own coding rules)
---

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 0e53104cd4..34ff981a6d 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -641,8 +641,8 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 #endif
 
 #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
+	LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
 	{
-		LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
 		char	*name = ldap_int_hostname;
 
 		ldap_int_hostname = ldap_pvt_get_fqdn( name );
@@ -650,8 +650,8 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 		if ( name != NULL && name != ldap_int_hostname ) {
 			LDAP_FREE( name );
 		}
-		LDAP_MUTEX_UNLOCK( &ldap_int_hostname_mutex );
 	}
+	LDAP_MUTEX_UNLOCK( &ldap_int_hostname_mutex );
 #endif
 
 #ifndef HAVE_POLL