Partial support for a new option to help debug TLS connections,

[openldap] / libraries / libldap / init.c

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index b4f82f95c7dc253f621212bf768c7216de085581..5906bf78ae2f0a4018da9badaad54404f40e71f0 100644 (file)
--- 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,7 +13,7 @@
 #include <ac/time.h>
 
 #include "ldap-int.h"
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
 
 struct ldapoptions ldap_int_global_options =
        { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE };  
@@ -26,6 +26,7 @@ struct ldapoptions ldap_int_global_options =
 #define ATTR_INT       2
 #define ATTR_KV                3
 #define ATTR_STRING    4
+#define ATTR_TLS       5
 
 struct ol_keyvalue {
        const char *            key;
@@ -61,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)
@@ -168,6 +175,11 @@ static void openldap_ldap_init_w_conf(const char *file)
                                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;
                        }
                }
        }
@@ -222,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);
@@ -279,6 +291,11 @@ static void openldap_ldap_init_w_env(const char *prefix)
                                * (char**) p = LDAP_STRDUP(value);
                        }
                        break;
+               case ATTR_TLS:
+#ifdef HAVE_TLS
+                       ldap_pvt_tls_config( attrs[i].offset, value );
+#endif                         
+                       break;
                }
        }
 }
@@ -291,6 +308,13 @@ void ldap_int_initialize( void )
 
        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;
@@ -307,17 +331,21 @@ void ldap_int_initialize( void )
 
        LDAP_BOOL_SET(&gopts, LDAP_BOOL_REFERRALS);
 
+#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 );
@@ -325,7 +353,7 @@ void ldap_int_initialize( void )
        }
 
        {
-               char *altfile = getenv("LDAPRC");
+               char *altfile = getenv(LDAP_ENV_PREFIX "RC");
 
                if( altfile != NULL ) {
                        openldap_ldap_init_w_userconf( altfile );