Fix ldap_rename parameter order (ITS#387)

[openldap] / libraries / libldap / init.c

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 4e45c7554ad7bbce9311d9ab2f3eb29ac6f78807..805b1f18ed67a046be653bf77c515aa8a9a5f0a5 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -26,6 +27,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;
@@ -59,12 +61,18 @@ static const struct ol_attribute {
        {ATTR_INT,              "PORT",                 NULL,
                offsetof(struct ldapoptions, ldo_defport)},
        {ATTR_BOOL,             "REFERRALS",    NULL,   LDAP_BOOL_REFERRALS},
-       {ATTR_BOOL,             "RESTART",      NULL,   LDAP_BOOL_RESTART},
-       {ATTR_BOOL,             "DNS",          NULL,   LDAP_BOOL_DNS},
+       {ATTR_BOOL,             "RESTART",              NULL,   LDAP_BOOL_RESTART},
+       {ATTR_BOOL,             "DNS",                  NULL,   LDAP_BOOL_DNS},
+       {ATTR_TLS,              "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 +176,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;
                        }
                }
        }
@@ -279,6 +292,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( &gopts, attrs[i].offset, value );
+#endif                         
+                       break;
                }
        }
 }
@@ -290,15 +308,23 @@ 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_debug = 0;
+
        gopts.ldo_version =     LDAP_VERSION2;
        gopts.ldo_deref =       LDAP_DEREF_NEVER;
        gopts.ldo_timelimit = LDAP_NO_LIMIT;
        gopts.ldo_sizelimit = LDAP_NO_LIMIT;
 
-       gopts.ldo_debug = 0;
+       gopts.ldo_tm_api = (struct timeval *)NULL;
+       gopts.ldo_tm_net = (struct timeval *)NULL;
 
        gopts.ldo_defhost = LDAP_STRDUP("localhost");
        gopts.ldo_defport = LDAP_PORT;
@@ -309,6 +335,10 @@ 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 ) {