Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / libldap / init.c

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 3355b4c8dcb3ee05428ff25697ce4e8a35c7dfa7..861752760153351fdba5101d0a8e9ce58d1e8038 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2011 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,13 @@
 #include "lutil.h"
 
 struct ldapoptions ldap_int_global_options =
-       { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG };  
+       { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE
+               LDAP_LDO_NULLARG
+               LDAP_LDO_CONNECTIONLESS_NULLARG
+               LDAP_LDO_TLS_NULLARG
+               LDAP_LDO_SASL_NULLARG
+               LDAP_LDO_GSSAPI_NULLARG
+               LDAP_LDO_MUTEX_NULLARG };
 
 #define ATTR_NONE      0
 #define ATTR_BOOL      1
@@ -510,7 +516,9 @@ ldap_int_destroy_global_options(void)
  */
 void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl )
 {
+#ifdef LDAP_R_COMPILE
        LDAP_PVT_MUTEX_FIRSTCREATE(gopts->ldo_mutex);
+#endif
        LDAP_MUTEX_LOCK( &gopts->ldo_mutex );
        if (gopts->ldo_valid == LDAP_INITIALIZED) {
                /* someone else got here first */
@@ -624,7 +632,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
            return; 
        }
 }      /* The WinSock DLL is acceptable. Proceed. */
-#elif HAVE_WINSOCK
+#elif defined(HAVE_WINSOCK)
 {      WSADATA wsaData;
        if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
            return;
@@ -633,6 +641,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 #endif
 
 #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
+       LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
        {
                char    *name = ldap_int_hostname;
 
@@ -642,13 +651,14 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
                        LDAP_FREE( name );
                }
        }
+       LDAP_MUTEX_UNLOCK( &ldap_int_hostname_mutex );
 #endif
 
 #ifndef HAVE_POLL
        if ( ldap_int_tblsize == 0 ) ldap_int_ip_init();
 #endif
 
-       ldap_int_initialize_global_options(gopts, NULL);
+       ldap_int_initialize_global_options(gopts, dbglvl);
 
        if( getenv("LDAPNOINIT") != NULL ) {
                return;