From: Howard Chu <hyc@openldap.org>
Date: Mon, 26 Aug 2002 08:56:59 +0000 (+0000)
Subject: Import ITS#2019 fix from HEAD (gethostbyname mutex init)
X-Git-Tag: OPENLDAP_REL_ENG_2_0_26~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1620b1da347602333cc7ebfa11718463d92cc2c8;p=thirdparty%2Fopenldap.git

Import ITS#2019 fix from HEAD (gethostbyname mutex init)
---

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index dea29f67d3..0da9d04b63 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -253,7 +253,7 @@ static void openldap_ldap_init_w_userconf(const char *file)
 	if (home != NULL) {
 		Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is %s\n",
 		      home, 0, 0);
-		path = LDAP_MALLOC(strlen(home) + strlen(file) + 3);
+		path = LDAP_MALLOC(strlen(home) + strlen(file) + sizeof( LDAP_DIRSEP "."));
 	} else {
 		Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is NULL\n",
 		      0, 0, 0);
@@ -263,11 +263,11 @@ static void openldap_ldap_init_w_userconf(const char *file)
 		/* we assume UNIX path syntax is used... */
 
 		/* try ~/file */
-		sprintf(path, "%s%s%s", home, LDAP_DIRSEP, file);
+		sprintf(path, "%s" LDAP_DIRSEP "%s", home, file);
 		openldap_ldap_init_w_conf(path, 1);
 
 		/* try ~/.file */
-		sprintf(path, "%s%s.%s", home, LDAP_DIRSEP, file);
+		sprintf(path, "%s" LDAP_DIRSEP ".%s", home, file);
 		openldap_ldap_init_w_conf(path, 1);
 	}
 
@@ -476,12 +476,12 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 }
 #endif
 
+	ldap_int_utils_init();
+
 #if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \
 	|| defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
 	ldap_int_hostname = ldap_pvt_get_fqdn( ldap_int_hostname );
 #endif
-	ldap_int_utils_init();
-
 	if ( ldap_int_tblsize == 0 )
 		ldap_int_ip_init();