From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 13 Sep 2000 00:54:45 +0000 (+0000)
Subject: Move ldap_pvt_tls_init call to ldap_pvt_tls_start
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2035
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d554a31b589675c209ed5801f52864fc8cec1b81;p=openldap

Move ldap_pvt_tls_init call to ldap_pvt_tls_start
Relax user-only options on TLS_RANDFILE and TLS_REQCERT
---

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 1941a8b980..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}
@@ -443,12 +443,6 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 
 	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();
 
@@ -503,4 +497,6 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 	}
 
 	openldap_ldap_init_w_env(gopts, NULL);
+
+	ldap_int_sasl_init();
 }
diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index f16e4b1bb3..e5290018a9 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -861,6 +861,8 @@ ldap_pvt_tls_set_option( struct ldapoptions *lo, int option, void *arg )
 int
 ldap_pvt_tls_start ( LDAP *ld, Sockbuf *sb, void *ctx_arg )
 {
+	ldap_pvt_tls_init();
+
 	/*
 	 * Fortunately, the lib uses blocking io...
 	 */