X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Finit.c;h=613bd93c57152bf35df9241e1ee82a5a69d63a3d;hb=0ea43c9d7d2fbf08b2078931bebfcaf443230878;hp=9e80c815bcb49b62d0103bd897fe1106f38e18b6;hpb=dc19332bb9db142c52b580e3f74a6c20d5c8ef23;p=openldap diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index 9e80c815bc..613bd93c57 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-2003 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,9 @@ #include #include +#ifdef HAVE_LIMITS_H #include +#endif #include "ldap-int.h" #include "ldap_defaults.h" @@ -91,18 +93,24 @@ static const struct ol_attribute { #endif #ifdef HAVE_TLS - {1, ATTR_TLS, "TLS_CERT", NULL, LDAP_OPT_X_TLS_CERTFILE}, - {1, ATTR_TLS, "TLS_KEY", NULL, LDAP_OPT_X_TLS_KEYFILE}, - {0, ATTR_TLS, "TLS_CACERT", NULL, LDAP_OPT_X_TLS_CACERTFILE}, - {0, ATTR_TLS, "TLS_CACERTDIR",NULL, LDAP_OPT_X_TLS_CACERTDIR}, - {0, ATTR_TLS, "TLS_REQCERT", NULL, LDAP_OPT_X_TLS_REQUIRE_CERT}, - {0, ATTR_TLS, "TLS_RANDFILE", NULL, LDAP_OPT_X_TLS_RANDOM_FILE}, + {1, ATTR_TLS, "TLS_CERT", NULL, LDAP_OPT_X_TLS_CERTFILE}, + {1, ATTR_TLS, "TLS_KEY", NULL, LDAP_OPT_X_TLS_KEYFILE}, + {0, ATTR_TLS, "TLS_CACERT", NULL, LDAP_OPT_X_TLS_CACERTFILE}, + {0, ATTR_TLS, "TLS_CACERTDIR", NULL, LDAP_OPT_X_TLS_CACERTDIR}, + {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}, + +#ifdef HAVE_OPENSSL_CRL + {0, ATTR_TLS, "TLS_CRLCHECK", NULL, LDAP_OPT_X_TLS_CRLCHECK}, +#endif + #endif {0, ATTR_NONE, NULL, NULL, 0} }; -#define MAX_LDAP_ATTR_LEN sizeof("TLS_CACERTDIR") +#define MAX_LDAP_ATTR_LEN sizeof("TLS_CIPHER_SUITE") #define MAX_LDAP_ENV_PREFIX_LEN 8 static void openldap_ldap_init_w_conf( @@ -124,12 +132,7 @@ static void openldap_ldap_init_w_conf( return; } -#ifdef NEW_LOGGING - LDAP_LOG ( CONFIG, DETAIL1, - "openldap_init_w_conf: trying %s\n", file, 0, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "ldap_init: trying %s\n", file, 0, 0); -#endif fp = fopen(file, "r"); if(fp == NULL) { @@ -137,11 +140,7 @@ static void openldap_ldap_init_w_conf( return; } -#ifdef NEW_LOGGING - LDAP_LOG ( CONFIG, DETAIL1, "openldap_init_w_conf: using %s\n", file, 0, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "ldap_init: using %s\n", file, 0, 0); -#endif while((start = fgets(linebuf, sizeof(linebuf), fp)) != NULL) { /* skip lines starting with '#' */ @@ -269,22 +268,12 @@ static void openldap_ldap_init_w_userconf(const char *file) home = getenv("HOME"); if (home != NULL) { -#ifdef NEW_LOGGING - LDAP_LOG ( CONFIG, ARGS, - "openldap_init_w_userconf: HOME env is %s\n", home, 0, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is %s\n", home, 0, 0); -#endif path = LDAP_MALLOC(strlen(home) + strlen(file) + sizeof( LDAP_DIRSEP ".")); } else { -#ifdef NEW_LOGGING - LDAP_LOG ( CONFIG, ARGS, "openldap_init_w_userconf: HOME env is NULL\n", - 0, 0, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is NULL\n", 0, 0, 0); -#endif } if(home != NULL && path != NULL) { @@ -408,6 +397,9 @@ ldap_int_destroy_global_options(void) { struct ldapoptions *gopts = LDAP_INT_GLOBAL_OPT(); + if ( gopts == NULL ) + return; + gopts->ldo_valid = LDAP_UNINITIALIZED; if ( gopts->ldo_defludp ) { @@ -477,6 +469,11 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl SASL_SEC_NOPLAINTEXT | SASL_SEC_NOANONYMOUS; #endif +#ifdef HAVE_TLS + gopts->ldo_tls_connect_cb = NULL; + gopts->ldo_tls_connect_arg = NULL; +#endif + gopts->ldo_valid = LDAP_INITIALIZED; return; } @@ -534,8 +531,10 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl ) || defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL) ldap_int_hostname = ldap_pvt_get_fqdn( ldap_int_hostname ); #endif - if ( ldap_int_tblsize == 0 ) - ldap_int_ip_init(); + +#ifndef HAVE_POLL + if ( ldap_int_tblsize == 0 ) ldap_int_ip_init(); +#endif ldap_int_initialize_global_options(gopts, NULL); @@ -564,50 +563,26 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl ) char *altfile = getenv(LDAP_ENV_PREFIX "CONF"); if( altfile != NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG ( CONFIG, DETAIL1, - "openldap_init_w_userconf: %sCONF env is %s\n", - LDAP_ENV_PREFIX, altfile, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is %s\n", LDAP_ENV_PREFIX "CONF", altfile, 0); -#endif openldap_ldap_init_w_sysconf( altfile ); } else -#ifdef NEW_LOGGING - LDAP_LOG ( CONFIG, DETAIL1, - "openldap_init_w_userconf: %sCONF env is NULL\n", - LDAP_ENV_PREFIX, 0, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is NULL\n", LDAP_ENV_PREFIX "CONF", 0, 0); -#endif } { char *altfile = getenv(LDAP_ENV_PREFIX "RC"); if( altfile != NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG ( CONFIG, DETAIL1, - "openldap_init_w_userconf: %sRC env is %s\n", - LDAP_ENV_PREFIX, altfile, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is %s\n", LDAP_ENV_PREFIX "RC", altfile, 0); -#endif openldap_ldap_init_w_userconf( altfile ); } else -#ifdef NEW_LOGGING - LDAP_LOG ( CONFIG, DETAIL1, - "openldap_init_w_userconf: %sRC env is NULL\n", - LDAP_ENV_PREFIX, 0, 0 ); -#else Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is NULL\n", LDAP_ENV_PREFIX "RC", 0, 0); -#endif } openldap_ldap_init_w_env(gopts, NULL);