X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Finit.c;h=cf49633cb9045f32e0cd673352fb92b4d7a5c140;hb=e1b73eda9373ea3bddd532727a2987363dc3c108;hp=3da4d7bf4b2554c943a6d8a0af7cc98236b53a97;hpb=7eec2674364993167a2b2495d1aefb84809a5386;p=openldap diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index 3da4d7bf4b..cf49633cb9 100644 --- a/libraries/libldap/init.c +++ b/libraries/libldap/init.c @@ -1,39 +1,42 @@ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ #include "portable.h" #include -#include +#include #include #include #include #include -#include "ldap-int.h" -#include "ldapconfig.h" - -struct ldapoptions openldap_ldap_global_options = { LDAP_DEBUG_NONE }; +#include -#undef gopts -#define gopts openldap_ldap_global_options +#include "ldap-int.h" +#include "ldap_defaults.h" -int openldap_ldap_initialized = 0; +struct ldapoptions ldap_int_global_options = + { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE }; #define ATTR_NONE 0 #define ATTR_BOOL 1 #define ATTR_INT 2 #define ATTR_KV 3 #define ATTR_STRING 4 +#define ATTR_URIS 5 + +#define ATTR_SASL 6 +#define ATTR_TLS 7 struct ol_keyvalue { - char* key; + const char * key; int value; }; -static struct ol_keyvalue deref_kv[] = { +static const struct ol_keyvalue deref_kv[] = { {"never", LDAP_DEREF_NEVER}, {"searching", LDAP_DEREF_SEARCHING}, {"finding", LDAP_DEREF_FINDING}, @@ -41,65 +44,101 @@ static struct ol_keyvalue deref_kv[] = { {NULL, 0} }; -static struct ol_attribute { +static const struct ol_attribute { + int useronly; int type; - char* name; - void* data; + const char * name; + const void * data; size_t offset; } attrs[] = { - {ATTR_KV, "DEREF", deref_kv, /* or &deref_kv[0] */ + {0, ATTR_KV, "DEREF", deref_kv, /* or &deref_kv[0] */ offsetof(struct ldapoptions, ldo_deref)}, - {ATTR_INT, "SIZELIMIT", NULL, + {0, ATTR_INT, "SIZELIMIT", NULL, offsetof(struct ldapoptions, ldo_sizelimit)}, - {ATTR_INT, "TIMELIMIT", NULL, + {0, ATTR_INT, "TIMELIMIT", NULL, offsetof(struct ldapoptions, ldo_timelimit)}, - {ATTR_STRING, "BASE", NULL, + {1, ATTR_STRING, "BINDDN", NULL, + offsetof(struct ldapoptions, ldo_defbinddn)}, + {0, ATTR_STRING, "BASE", NULL, offsetof(struct ldapoptions, ldo_defbase)}, - {ATTR_STRING, "HOST", NULL, - offsetof(struct ldapoptions, ldo_defhost)}, - {ATTR_INT, "PORT", NULL, + {0, ATTR_INT, "PORT", NULL, /* deprecated */ offsetof(struct ldapoptions, ldo_defport)}, - {ATTR_BOOL, "REFERRALS", (void *) LDAP_BOOL_REFERRALS, 0}, - {ATTR_BOOL, "RESTART", (void *) LDAP_BOOL_RESTART, 0}, - {ATTR_BOOL, "DNS", (void *) LDAP_BOOL_DNS, 0}, - {ATTR_NONE, NULL, NULL, 0} + {0, ATTR_URIS, "HOST", NULL, 1}, /* deprecated */ + {0, ATTR_URIS, "URI", NULL, 0}, /* replaces HOST/URI */ + {0, ATTR_BOOL, "REFERRALS", NULL, LDAP_BOOL_REFERRALS}, + {0, ATTR_BOOL, "RESTART", NULL, LDAP_BOOL_RESTART}, + +#ifdef HAVE_CYRUS_SASL + {1, ATTR_STRING, "SASL_MECH", NULL, + offsetof(struct ldapoptions, ldo_def_sasl_mech)}, + {1, ATTR_STRING, "SASL_REALM", NULL, + offsetof(struct ldapoptions, ldo_def_sasl_realm)}, + {1, ATTR_STRING, "SASL_AUTHCID", NULL, + offsetof(struct ldapoptions, ldo_def_sasl_authcid)}, + {1, ATTR_STRING, "SASL_AUTHZID", NULL, + offsetof(struct ldapoptions, ldo_def_sasl_authzid)}, + {0, ATTR_SASL, "SASL_SECPROPS", NULL, LDAP_OPT_X_SASL_SECPROPS}, +#endif + +#ifdef HAVE_TLS + {0, ATTR_TLS, "TLS", NULL, LDAP_OPT_X_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}, +#endif + + {0, ATTR_NONE, NULL, NULL, 0} }; -#define MAX_LDAP_ATTR_LEN sizeof("SIZELIMIT") +#define MAX_LDAP_ATTR_LEN sizeof("TLS_CACERTDIR") #define MAX_LDAP_ENV_PREFIX_LEN 8 -static void openldap_ldap_init_w_conf(const char *file) +static void openldap_ldap_init_w_conf( + const char *file, int userconf ) { char linebuf[128]; FILE *fp; int i; char *cmd, *opt; char *start, *end; + struct ldapoptions *gopts; + + if ((gopts = LDAP_INT_GLOBAL_OPT()) == NULL) { + return; /* Could not allocate mem for global options */ + } if (file == NULL) { /* no file name */ return; } + Debug(LDAP_DEBUG_TRACE, "ldap_init: trying %s\n", file, 0, 0); + fp = fopen(file, "r"); if(fp == NULL) { /* could not open file */ return; } + Debug(LDAP_DEBUG_TRACE, "ldap_init: using %s\n", file, 0, 0); + while((start = fgets(linebuf, sizeof(linebuf), fp)) != NULL) { /* skip lines starting with '#' */ if(*start == '#') continue; /* trim leading white space */ - while((*start != '\0') && isspace(*start)) start++; + while((*start != '\0') && isspace((unsigned char) *start)) + start++; /* anything left? */ if(*start == '\0') continue; /* trim trailing white space */ end = &start[strlen(start)-1]; - while(isspace(*end)) end--; + while(isspace((unsigned char)*end)) end--; end[1] = '\0'; /* anything left? */ @@ -108,7 +147,7 @@ static void openldap_ldap_init_w_conf(const char *file) /* parse the command */ cmd=start; - while((*start != '\0') && !isspace(*start)) { + while((*start != '\0') && !isspace((unsigned char)*start)) { start++; } if(*start == '\0') { @@ -118,18 +157,20 @@ static void openldap_ldap_init_w_conf(const char *file) *start++ = '\0'; - /* we must have some non-whitespace to skip */ - while(isspace(*start)) start++; + /* we must have some whitespace to skip */ + while(isspace((unsigned char)*start)) start++; opt = start; for(i=0; attrs[i].type != ATTR_NONE; i++) { void *p; - if(strcasecmp(cmd, attrs[i].name) != 0) { + if( !userconf && attrs[i].useronly ) { continue; } - p = &((char *) &gopts)[attrs[i].offset]; + if(strcasecmp(cmd, attrs[i].name) != 0) { + continue; + } switch(attrs[i].type) { case ATTR_BOOL: @@ -137,26 +178,28 @@ static void openldap_ldap_init_w_conf(const char *file) || (strcasecmp(opt, "yes") == 0) || (strcasecmp(opt, "true") == 0)) { - LDAP_BOOL_SET(&gopts, (int) attrs[i].data); + LDAP_BOOL_SET(gopts, attrs[i].offset); } else { - LDAP_BOOL_CLR(&gopts, (int) attrs[i].data); + LDAP_BOOL_CLR(gopts, attrs[i].offset); } break; case ATTR_INT: + p = &((char *) gopts)[attrs[i].offset]; * (int*) p = atoi(opt); break; case ATTR_KV: { - struct ol_keyvalue *kv; + const struct ol_keyvalue *kv; - for(kv = (struct ol_keyvalue *) attrs[i].data; + for(kv = attrs[i].data; kv->key != NULL; kv++) { if(strcasecmp(opt, kv->key) == 0) { + p = &((char *) gopts)[attrs[i].offset]; * (int*) p = kv->value; break; } @@ -164,18 +207,45 @@ static void openldap_ldap_init_w_conf(const char *file) } break; case ATTR_STRING: - if (* (char**) p != NULL) free(* (char**) p); - * (char**) p = strdup(opt); + p = &((char *) gopts)[attrs[i].offset]; + if (* (char**) p != NULL) LDAP_FREE(* (char**) p); + * (char**) p = LDAP_STRDUP(opt); + break; + case ATTR_URIS: + if (attrs[i].offset == 0) { + ldap_set_option( NULL, LDAP_OPT_URI, opt ); + } else { + ldap_set_option( NULL, LDAP_OPT_HOST_NAME, opt ); + } + break; + case ATTR_SASL: +#ifdef HAVE_CYRUS_SASL + ldap_int_sasl_config( gopts, attrs[i].offset, opt ); +#endif + break; + case ATTR_TLS: +#ifdef HAVE_TLS + ldap_int_tls_config( gopts, attrs[i].offset, opt ); +#endif break; } + + break; } } + + fclose(fp); +} + +static void openldap_ldap_init_w_sysconf(const char *file) +{ + openldap_ldap_init_w_conf( file, 0 ); } static void openldap_ldap_init_w_userconf(const char *file) { char *home; - char *path; + char *path = NULL; if (file == NULL) { /* no file name */ @@ -185,9 +255,12 @@ static void openldap_ldap_init_w_userconf(const char *file) home = getenv("HOME"); if (home != NULL) { - path = malloc(strlen(home) + strlen(file) + 3); + Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is %s\n", + home, 0, 0); + path = LDAP_MALLOC(strlen(home) + strlen(file) + 3); } else { - path = malloc(strlen(file) + 3); + Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is NULL\n", + 0, 0, 0); } if(home != NULL && path != NULL) { @@ -195,22 +268,24 @@ static void openldap_ldap_init_w_userconf(const char *file) /* try ~/file */ sprintf(path, "%s/%s", home, file); - openldap_ldap_init_w_conf(path); + openldap_ldap_init_w_conf(path, 1); /* try ~/.file */ sprintf(path, "%s/.%s", home, file); - openldap_ldap_init_w_conf(path); + openldap_ldap_init_w_conf(path, 1); } if(path != NULL) { - free(path); + LDAP_FREE(path); } /* try file */ - openldap_ldap_init_w_conf(file); + openldap_ldap_init_w_conf(file, 1); } -static void openldap_ldap_init_w_env(const char *prefix) +static void openldap_ldap_init_w_env( + struct ldapoptions *gopts, + const char *prefix) { char buf[MAX_LDAP_ATTR_LEN+MAX_LDAP_ENV_PREFIX_LEN]; int len; @@ -219,7 +294,7 @@ static void openldap_ldap_init_w_env(const char *prefix) char *value; if (prefix == NULL) { - prefix = DEFAULT_LDAP_ENV_PREFIX; + prefix = LDAP_ENV_PREFIX; } strncpy(buf, prefix, MAX_LDAP_ENV_PREFIX_LEN); @@ -234,33 +309,33 @@ static void openldap_ldap_init_w_env(const char *prefix) continue; } - p = &((char *) &gopts)[attrs[i].offset]; - switch(attrs[i].type) { case ATTR_BOOL: if((strcasecmp(value, "on") == 0) || (strcasecmp(value, "yes") == 0) || (strcasecmp(value, "true") == 0)) { - LDAP_BOOL_SET(&gopts, (int) attrs[i].data); + LDAP_BOOL_SET(gopts, attrs[i].offset); } else { - LDAP_BOOL_CLR(&gopts, (int) attrs[i].data); + LDAP_BOOL_CLR(gopts, attrs[i].offset); } break; case ATTR_INT: + p = &((char *) gopts)[attrs[i].offset]; * (int*) p = atoi(value); break; case ATTR_KV: { - struct ol_keyvalue *kv; + const struct ol_keyvalue *kv; - for(kv = (struct ol_keyvalue *) attrs[i].data; + for(kv = attrs[i].data; kv->key != NULL; kv++) { if(strcasecmp(value, kv->key) == 0) { + p = &((char *) gopts)[attrs[i].offset]; * (int*) p = kv->value; break; } @@ -268,68 +343,160 @@ static void openldap_ldap_init_w_env(const char *prefix) } break; case ATTR_STRING: - if (* (char**) p != NULL) free(* (char**) p); + p = &((char *) gopts)[attrs[i].offset]; + if (* (char**) p != NULL) LDAP_FREE(* (char**) p); if (*value == '\0') { * (char**) p = NULL; } else { - * (char**) p = strdup(value); + * (char**) p = LDAP_STRDUP(value); } break; + case ATTR_URIS: + if (attrs[i].offset == 0) { + ldap_set_option( NULL, LDAP_OPT_URI, value ); + } else { + ldap_set_option( NULL, LDAP_OPT_HOST_NAME, value ); + } + break; + case ATTR_SASL: +#ifdef HAVE_CYRUS_SASL + ldap_int_sasl_config( gopts, attrs[i].offset, value ); +#endif + break; + case ATTR_TLS: +#ifdef HAVE_TLS + ldap_int_tls_config( gopts, attrs[i].offset, value ); +#endif + break; } } } -void openldap_ldap_initialize( void ) +/* + * Initialize the global options structure with default values. + */ +void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl ) { - if ( openldap_ldap_initialized ) { - return; - } + if (dbglvl) + gopts->ldo_debug = *dbglvl; + else + gopts->ldo_debug = 0; + + gopts->ldo_version = LDAP_VERSION2; + gopts->ldo_deref = LDAP_DEREF_NEVER; + gopts->ldo_timelimit = LDAP_NO_LIMIT; + gopts->ldo_sizelimit = LDAP_NO_LIMIT; + + gopts->ldo_tm_api = (struct timeval *)NULL; + gopts->ldo_tm_net = (struct timeval *)NULL; - ldap_pvt_init_utils(); + /* ldo_defludp is leaked, we should have an at_exit() handler + * to free this and whatever else needs to cleaned up. + */ + ldap_url_parselist(&gopts->ldo_defludp, "ldap://localhost/"); + gopts->ldo_defport = LDAP_PORT; + + gopts->ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT; + gopts->ldo_rebindproc = NULL; + + LDAP_BOOL_ZERO(gopts); + + LDAP_BOOL_SET(gopts, LDAP_BOOL_REFERRALS); + +#ifdef HAVE_CYRUS_SASL + gopts->ldo_def_sasl_mech = NULL; + gopts->ldo_def_sasl_realm = NULL; + gopts->ldo_def_sasl_authcid = NULL; + gopts->ldo_def_sasl_authzid = NULL; + + memset( &gopts->ldo_sasl_secprops, '\0', sizeof(gopts->ldo_sasl_secprops) ); + + gopts->ldo_sasl_secprops.max_ssf = INT_MAX; + gopts->ldo_sasl_secprops.maxbufsize = 65536; + gopts->ldo_sasl_secprops.security_flags = SASL_SEC_NOPLAINTEXT|SASL_SEC_NOANONYMOUS; +#endif - gopts.ldo_version = LDAP_VERSION2; - gopts.ldo_deref = LDAP_DEREF_NEVER; - gopts.ldo_timelimit = LDAP_NO_LIMIT; - gopts.ldo_sizelimit = LDAP_NO_LIMIT; +#ifdef HAVE_TLS + gopts->ldo_tls_ctx = NULL; +#endif - gopts.ldo_debug = 0; + gopts->ldo_valid = LDAP_INITIALIZED; - gopts.ldo_defhost = strdup("localhost"); - gopts.ldo_defport = LDAP_PORT; + return; +} - gopts.ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT; +#if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \ + || defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL) +char * ldap_int_hostname = NULL; +#endif - LDAP_BOOL_ZERO(&gopts); +void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl ) +{ + if ( gopts->ldo_valid == LDAP_INITIALIZED ) { + return; + } -#if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) || \ - LDAP_VERSION_MAX > LDAP_VERSION2 - LDAP_BOOL_SET(&gopts, LDAP_BOOL_REFERRALS); +#if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \ + || defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL) + ldap_int_hostname = ldap_pvt_get_fqdn( ldap_int_hostname ); #endif - openldap_ldap_initialized = 1; + ldap_int_utils_init(); + + if ( ldap_int_tblsize == 0 ) + ldap_int_ip_init(); + + ldap_int_initialize_global_options(gopts, NULL); if( getenv("LDAPNOINIT") != NULL ) { return; } - openldap_ldap_init_w_conf(DEFAULT_LDAP_CONF_FILE); - openldap_ldap_init_w_userconf(DEFAULT_LDAP_USERRC_FILE); +#ifdef HAVE_CYRUS_SASL + { + /* set authentication identity to current user name */ + char *user = getenv("USER"); + + if( user == NULL ) user = getenv("USERNAME"); + if( user == NULL ) user = getenv("LOGNAME"); + + if( user != NULL ) { + /* this value is leaked, need at_exit() handler */ + gopts->ldo_def_sasl_authcid = LDAP_STRDUP( user ); + } + } +#endif + + openldap_ldap_init_w_sysconf(LDAP_CONF_FILE); + openldap_ldap_init_w_userconf(LDAP_USERRC_FILE); { - char *altfile = getenv("LDAPCONF"); + char *altfile = getenv(LDAP_ENV_PREFIX "CONF"); if( altfile != NULL ) { - openldap_ldap_init_w_conf( altfile ); + Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is %s\n", + LDAP_ENV_PREFIX "CONF", altfile, 0); + openldap_ldap_init_w_sysconf( altfile ); } + else + Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is NULL\n", + LDAP_ENV_PREFIX "CONF", 0, 0); } { - char *altfile = getenv("LDAPRC"); + char *altfile = getenv(LDAP_ENV_PREFIX "RC"); if( altfile != NULL ) { + Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is %s\n", + LDAP_ENV_PREFIX "RC", altfile, 0); openldap_ldap_init_w_userconf( altfile ); } + else + Debug(LDAP_DEBUG_TRACE, "ldap_init: %s env is NULL\n", + LDAP_ENV_PREFIX "RC", 0, 0); } - openldap_ldap_init_w_env(NULL); + openldap_ldap_init_w_env(gopts, NULL); + + ldap_int_sasl_init(); }