X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Finit.c;h=0057978a05d79ad9147a686997b2b44e72614c72;hb=d9a60db75ea1dbbc06d90d15e6f6969d8c075ee7;hp=4109b7eb7490b544e23983d5033e94fa9390f5cd;hpb=f7484f78e67085b7fb19c23a08b6f5e426e5a1e7;p=openldap
diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 4109b7eb74..0057978a05 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -18,6 +18,10 @@
#include
#include
+#ifdef HAVE_GETEUID
+#include
+#endif
+
#include
#include
#include
@@ -32,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
@@ -102,6 +106,7 @@ static const struct ol_attribute {
{1, ATTR_STRING, "SASL_AUTHZID", NULL,
offsetof(struct ldapoptions, ldo_def_sasl_authzid)},
{0, ATTR_SASL, "SASL_SECPROPS", NULL, LDAP_OPT_X_SASL_SECPROPS},
+ {0, ATTR_BOOL, "SASL_NOCANON", NULL, LDAP_BOOL_SASL_NOCANON},
#endif
#ifdef HAVE_GSSAPI
@@ -118,6 +123,7 @@ static const struct ol_attribute {
{0, ATTR_TLS, "TLS_REQCERT", NULL, LDAP_OPT_X_TLS_REQUIRE_CERT},
{0, ATTR_TLS, "TLS_RANDFILE", NULL, LDAP_OPT_X_TLS_RANDOM_FILE},
{0, ATTR_TLS, "TLS_CIPHER_SUITE", NULL, LDAP_OPT_X_TLS_CIPHER_SUITE},
+ {0, ATTR_TLS, "TLS_PROTOCOL_MIN", NULL, LDAP_OPT_X_TLS_PROTOCOL_MIN},
#ifdef HAVE_OPENSSL_CRL
{0, ATTR_TLS, "TLS_CRLCHECK", NULL, LDAP_OPT_X_TLS_CRLCHECK},
@@ -269,7 +275,7 @@ static void openldap_ldap_init_w_conf(
break;
case ATTR_TLS:
#ifdef HAVE_TLS
- ldap_int_tls_config( NULL, attrs[i].offset, opt );
+ ldap_pvt_tls_config( NULL, attrs[i].offset, opt );
#endif
break;
case ATTR_OPT_TV: {
@@ -421,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 );
+ ldap_pvt_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;
}
}
}
@@ -481,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
@@ -539,8 +577,12 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
gopts->ldo_tls_connect_arg = NULL;
gopts->ldo_tls_require_cert = LDAP_OPT_X_TLS_DEMAND;
#endif
+ gopts->ldo_keepalive_probes = 0;
+ gopts->ldo_keepalive_interval = 0;
+ gopts->ldo_keepalive_idle = 0;
gopts->ldo_valid = LDAP_INITIALIZED;
+ LDAP_MUTEX_UNLOCK( &gopts->ldo_mutex );
return;
}
@@ -584,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;
@@ -629,6 +671,12 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
#endif
openldap_ldap_init_w_sysconf(LDAP_CONF_FILE);
+
+#ifdef HAVE_GETEUID
+ if ( geteuid() != getuid() )
+ return;
+#endif
+
openldap_ldap_init_w_userconf(LDAP_USERRC_FILE);
{