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 c49b372ae93c2818f48315a9c0f8cdaf051c07de..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
@@ -60,11 +61,11 @@ 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,             "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_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},
@@ -293,7 +294,7 @@ static void openldap_ldap_init_w_env(const char *prefix)
                        break;
                case ATTR_TLS:
 #ifdef HAVE_TLS
-                       ldap_pvt_tls_config( attrs[i].offset, value );
+                       ldap_pvt_tls_config( &gopts, attrs[i].offset, value );
 #endif                         
                        break;
                }