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 3f6e3d61e027f583704451a372a67d397f243997..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-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,6 +18,10 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
+#ifdef HAVE_GETEUID
+#include <ac/unistd.h>
+#endif
+
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/ctype.h>
@@ -32,7 +36,13 @@
 #include "lutil.h"
 
 struct ldapoptions ldap_int_global_options =
-       { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE };  
+       { 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
@@ -47,6 +57,8 @@ struct ldapoptions ldap_int_global_options =
 #define ATTR_OPT_TV    8
 #define ATTR_OPT_INT   9
 
+#define ATTR_GSSAPI    10
+
 struct ol_keyvalue {
        const char *            key;
        int                     value;
@@ -100,6 +112,13 @@ 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
+       {0, ATTR_GSSAPI,"GSSAPI_SIGN",                  NULL,   LDAP_OPT_SIGN},
+       {0, ATTR_GSSAPI,"GSSAPI_ENCRYPT",               NULL,   LDAP_OPT_ENCRYPT},
+       {0, ATTR_GSSAPI,"GSSAPI_ALLOW_REMOTE_PRINCIPAL",NULL,   LDAP_OPT_X_GSSAPI_ALLOW_REMOTE_PRINCIPAL},
 #endif
 
 #ifdef HAVE_TLS
@@ -110,12 +129,13 @@ 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},
 #endif
 #ifdef HAVE_GNUTLS
-       {0, ATTR_TLS,   "TLS_CRL",                      NULL,   LDAP_OPT_X_TLS_CRLFILE},
+       {0, ATTR_TLS,   "TLS_CRLFILE",                  NULL,   LDAP_OPT_X_TLS_CRLFILE},
 #endif
         
 #endif
@@ -123,7 +143,7 @@ static const struct ol_attribute {
        {0, ATTR_NONE,          NULL,           NULL,   0}
 };
 
-#define MAX_LDAP_ATTR_LEN  sizeof("TLS_CIPHER_SUITE")
+#define MAX_LDAP_ATTR_LEN  sizeof("GSSAPI_ALLOW_REMOTE_PRINCIPAL")
 #define MAX_LDAP_ENV_PREFIX_LEN 8
 
 static void openldap_ldap_init_w_conf(
@@ -252,6 +272,11 @@ static void openldap_ldap_init_w_conf(
                        case ATTR_SASL:
 #ifdef HAVE_CYRUS_SASL
                                ldap_int_sasl_config( gopts, attrs[i].offset, opt );
+#endif
+                               break;
+                       case ATTR_GSSAPI:
+#ifdef HAVE_GSSAPI
+                               ldap_int_gssapi_config( gopts, attrs[i].offset, opt );
 #endif
                                break;
                        case ATTR_TLS:
@@ -408,11 +433,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;
                }
        }
 }
@@ -468,6 +516,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
@@ -526,8 +583,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;
 }
 
@@ -571,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;
@@ -580,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;
 
@@ -589,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;
@@ -616,6 +679,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);
 
        {