X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Finit.c;h=5906bf78ae2f0a4018da9badaad54404f40e71f0;hb=df8f7cbb9b79be3be9205d116d1dd0b263d6861a;hp=8c22855fd85f97472ec2463001687bb3ad8f8dbc;hpb=8c793fa1c9448716b777f0bd5c1e1ea1be9b587f;p=openldap

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 8c22855fd8..5906bf78ae 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -5,7 +5,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>
@@ -13,20 +13,20 @@
 #include <ac/time.h>
 
 #include "ldap-int.h"
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
 
-struct ldapoptions openldap_ldap_global_options = { LDAP_DEBUG_NONE };  
+struct ldapoptions ldap_int_global_options =
+	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE };  
 
 #undef gopts
-#define gopts openldap_ldap_global_options
-
-int	openldap_ldap_initialized = 0;
+#define gopts ldap_int_global_options
 
 #define ATTR_NONE	0
 #define ATTR_BOOL	1
 #define ATTR_INT	2
 #define ATTR_KV		3
 #define ATTR_STRING	4
+#define ATTR_TLS	5
 
 struct ol_keyvalue {
 	const char *		key;
@@ -62,10 +62,16 @@ static const struct ol_attribute {
 	{ATTR_BOOL,		"REFERRALS",	NULL,	LDAP_BOOL_REFERRALS},
 	{ATTR_BOOL,		"RESTART",	NULL,	LDAP_BOOL_RESTART},
 	{ATTR_BOOL,		"DNS",		NULL,	LDAP_BOOL_DNS},
+  	{ATTR_BOOL,		"TLS",		NULL,	LDAP_OPT_X_TLS},
+    	{ATTR_TLS,		"TLS_CERT",	NULL,	LDAP_OPT_X_TLS_CERTFILE},
+      	{ATTR_TLS,		"TLS_KEY",	NULL,	LDAP_OPT_X_TLS_KEYFILE},
+  	{ATTR_TLS,		"TLS_CACERT",	NULL,	LDAP_OPT_X_TLS_CACERTFILE},
+  	{ATTR_TLS,		"TLS_CACERTDIR",NULL,	LDAP_OPT_X_TLS_CACERTDIR},
+  	{ATTR_TLS,		"TLS_REQCERT",	NULL,	LDAP_OPT_X_TLS_REQUIRE_CERT},
 	{ATTR_NONE,		NULL,		NULL,	0}
 };
 
-#define MAX_LDAP_ATTR_LEN  sizeof("SIZELIMIT")
+#define MAX_LDAP_ATTR_LEN  sizeof("TLS_CACERTDIR")
 #define MAX_LDAP_ENV_PREFIX_LEN 8
 
 static void openldap_ldap_init_w_conf(const char *file)
@@ -166,8 +172,13 @@ static void openldap_ldap_init_w_conf(const char *file)
 
 			case ATTR_STRING:
 				p = &((char *) &gopts)[attrs[i].offset];
-				if (* (char**) p != NULL) free(* (char**) p);
-				* (char**) p = strdup(opt);
+				if (* (char**) p != NULL) LDAP_FREE(* (char**) p);
+				* (char**) p = LDAP_STRDUP(opt);
+				break;
+			case ATTR_TLS:
+#ifdef HAVE_TLS
+			   	ldap_pvt_tls_config( &gopts, attrs[i].offset, opt );
+#endif
 				break;
 			}
 		}
@@ -189,9 +200,9 @@ static void openldap_ldap_init_w_userconf(const char *file)
 	home = getenv("HOME");
 
 	if (home != NULL) {
-		path = malloc(strlen(home) + strlen(file) + 3);
+		path = LDAP_MALLOC(strlen(home) + strlen(file) + 3);
 	} else {
-		path = malloc(strlen(file) + 3);
+		path = LDAP_MALLOC(strlen(file) + 3);
 	}
 
 	if(home != NULL && path != NULL) {
@@ -207,7 +218,7 @@ static void openldap_ldap_init_w_userconf(const char *file)
 	}
 
 	if(path != NULL) {
-		free(path);
+		LDAP_FREE(path);
 	}
 
 	/* try file */
@@ -223,7 +234,7 @@ static void openldap_ldap_init_w_env(const char *prefix)
 	char *value;
 
 	if (prefix == NULL) {
-		prefix = DEFAULT_LDAP_ENV_PREFIX;
+		prefix = LDAP_ENV_PREFIX;
 	}
 
 	strncpy(buf, prefix, MAX_LDAP_ENV_PREFIX_LEN);
@@ -273,25 +284,37 @@ static void openldap_ldap_init_w_env(const char *prefix)
 
 		case ATTR_STRING:
 			p = &((char *) &gopts)[attrs[i].offset];
-			if (* (char**) p != NULL) free(* (char**) p);
+			if (* (char**) p != NULL) LDAP_FREE(* (char**) p);
 			if (*value == '\0') {
 				* (char**) p = NULL;
 			} else {
-				* (char**) p = strdup(value);
+				* (char**) p = LDAP_STRDUP(value);
 			}
 			break;
+		case ATTR_TLS:
+#ifdef HAVE_TLS
+		   	ldap_pvt_tls_config( attrs[i].offset, value );
+#endif			 	
+		   	break;
 		}
 	}
 }
 
-void openldap_ldap_initialize( void )
+void ldap_int_initialize( void )
 {
-	if ( openldap_ldap_initialized ) {
+	if ( gopts.ldo_valid == LDAP_INITIALIZED ) {
 		return;
 	}
 
 	ldap_int_utils_init();
 
+#ifdef HAVE_TLS
+   	ldap_pvt_tls_init();
+#endif
+
+	if ( ldap_int_tblsize == 0 )
+		ldap_int_ip_init();
+
 	gopts.ldo_version =	LDAP_VERSION2;
 	gopts.ldo_deref =	LDAP_DEREF_NEVER;
 	gopts.ldo_timelimit = LDAP_NO_LIMIT;
@@ -299,7 +322,7 @@ void openldap_ldap_initialize( void )
 
 	gopts.ldo_debug = 0;
 
-	gopts.ldo_defhost = strdup("localhost");
+	gopts.ldo_defhost = LDAP_STRDUP("localhost");
 	gopts.ldo_defport = LDAP_PORT;
 
 	gopts.ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
@@ -308,17 +331,21 @@ void openldap_ldap_initialize( void )
 
 	LDAP_BOOL_SET(&gopts, LDAP_BOOL_REFERRALS);
 
-	openldap_ldap_initialized = 1;
+#ifdef HAVE_TLS
+   	gopts.ldo_tls_ctx = NULL;
+#endif
+
+	gopts.ldo_valid = LDAP_INITIALIZED;
 
 	if( getenv("LDAPNOINIT") != NULL ) {
 		return;
 	}
 
-	openldap_ldap_init_w_conf(DEFAULT_LDAP_CONF_FILE);
-	openldap_ldap_init_w_userconf(DEFAULT_LDAP_USERRC_FILE);
+	openldap_ldap_init_w_conf(LDAP_CONF_FILE);
+	openldap_ldap_init_w_userconf(LDAP_USERRC_FILE);
 
 	{
-		char *altfile = getenv("LDAPCONF");
+		char *altfile = getenv(LDAP_ENV_PREFIX "CONF");
 
 		if( altfile != NULL ) {
 			openldap_ldap_init_w_conf( altfile );
@@ -326,7 +353,7 @@ void openldap_ldap_initialize( void )
 	}
 
 	{
-		char *altfile = getenv("LDAPRC");
+		char *altfile = getenv(LDAP_ENV_PREFIX "RC");
 
 		if( altfile != NULL ) {
 			openldap_ldap_init_w_userconf( altfile );