ITS#6437 cleanup (noop change): Compute pad,order_start at compile time

[openldap] / libraries / libldap / init.c

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index d21f44bb795cac84edff8368d70897e7dc74ac67..26576fabd88a423a47de19ee9c2e9bf963d79702 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-2009 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
 #include "lutil.h"
 
 struct ldapoptions ldap_int_global_options =
-       { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE };  
+       { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG };  
 
 #define ATTR_NONE      0
 #define ATTR_BOOL      1
@@ -427,11 +427,34 @@ static void openldap_ldap_init_w_env(
                        ldap_int_sasl_config( gopts, attrs[i].offset, value );
 #endif                         
                        break;
+               case ATTR_GSSAPI:
+#ifdef HAVE_GSSAPI
+                       ldap_int_gssapi_config( gopts, attrs[i].offset, value );
+#endif
+                       break;
                case ATTR_TLS:
 #ifdef HAVE_TLS
                        ldap_int_tls_config( NULL, attrs[i].offset, value );
 #endif                         
                        break;
+               case ATTR_OPT_TV: {
+                       struct timeval tv;
+                       char *next;
+                       tv.tv_usec = 0;
+                       tv.tv_sec = strtol( value, &next, 10 );
+                       if ( next != value && next[ 0 ] == '\0' && tv.tv_sec > 0 ) {
+                               (void)ldap_set_option( NULL, attrs[i].offset, (const void *)&tv );
+                       }
+                       } break;
+               case ATTR_OPT_INT: {
+                       long l;
+                       char *next;
+                       l = strtol( value, &next, 10 );
+                       if ( next != value && next[ 0 ] == '\0' && l > 0 && (long)((int)l) == l ) {
+                               int v = (int)l;
+                               (void)ldap_set_option( NULL, attrs[i].offset, (const void *)&v );
+                       }
+                       } break;
                }
        }
 }
@@ -487,6 +510,15 @@ 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 */
+               LDAP_MUTEX_UNLOCK( &gopts->ldo_mutex );
+               return;
+       }
        if (dbglvl)
            gopts->ldo_debug = *dbglvl;
        else
@@ -550,6 +582,7 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
        gopts->ldo_keepalive_idle = 0;
 
        gopts->ldo_valid = LDAP_INITIALIZED;
+       LDAP_MUTEX_UNLOCK( &gopts->ldo_mutex );
        return;
 }
 
@@ -593,7 +626,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;