X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Finit.c;h=cf49633cb9045f32e0cd673352fb92b4d7a5c140;hb=5941625eb79d899b49f012add4bc29da9f9e648f;hp=164761b6edfa4254a540a7cc4ecc5bb863b8da05;hpb=95eea5acccaffb85ee2ac4ffcf4cd45dbb0fc4a0;p=openldap

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 164761b6ed..cf49633cb9 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -86,8 +86,8 @@ static const struct ol_attribute {
 	{1, ATTR_TLS,		"TLS_KEY",		NULL,	LDAP_OPT_X_TLS_KEYFILE},
   	{0, ATTR_TLS,		"TLS_CACERT",	NULL,	LDAP_OPT_X_TLS_CACERTFILE},
   	{0, ATTR_TLS,		"TLS_CACERTDIR",NULL,	LDAP_OPT_X_TLS_CACERTDIR},
-  	{1, ATTR_TLS,		"TLS_REQCERT",	NULL,	LDAP_OPT_X_TLS_REQUIRE_CERT},
-	{1, ATTR_TLS,		"TLS_RANDFILE",	NULL,	LDAP_OPT_X_TLS_RANDOM_FILE},
+  	{0, ATTR_TLS,		"TLS_REQCERT",	NULL,	LDAP_OPT_X_TLS_REQUIRE_CERT},
+	{0, ATTR_TLS,		"TLS_RANDFILE",	NULL,	LDAP_OPT_X_TLS_RANDOM_FILE},
 #endif
 
 	{0, ATTR_NONE,		NULL,		NULL,	0}
@@ -427,7 +427,7 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
 
 #if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \
 	|| defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
-char * ldap_int_hostname = "localhost";
+char * ldap_int_hostname = NULL;
 #endif
 
 void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
@@ -438,23 +438,11 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 
 #if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \
 	|| defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
-	{
-		char hostbuf[MAXHOSTNAMELEN+1];
-		if( gethostname( hostbuf, MAXHOSTNAMELEN ) == 0 ) {
-			hostbuf[MAXHOSTNAMELEN] = '\0';
-			ldap_int_hostname = hostbuf;
-		}
-	}
+	ldap_int_hostname = ldap_pvt_get_fqdn( ldap_int_hostname );
 #endif
 
 	ldap_int_utils_init();
 
-#ifdef HAVE_TLS
-   	ldap_pvt_tls_init();
-#endif
-
-	ldap_int_sasl_init();
-
 	if ( ldap_int_tblsize == 0 )
 		ldap_int_ip_init();
 
@@ -509,4 +497,6 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 	}
 
 	openldap_ldap_init_w_env(gopts, NULL);
+
+	ldap_int_sasl_init();
 }