X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Finit.c;h=820c951e9597f44991f19bd3fc9f4ec4fcf41818;hb=bcf8f7eeb788faa25efe0ea78e66e83e9d9b4d73;hp=da6ed406cee2e5a061b997f4ee0563f2b7d98870;hpb=1fc810bfe55d7849ae4bad7fd9444ae3090186e8;p=openldap diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index da6ed406ce..820c951e95 100644 --- a/libraries/libldap/init.c +++ b/libraries/libldap/init.c @@ -1,34 +1,43 @@ +/* $OpenLDAP$ */ +/* + * 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 + #include "ldap-int.h" -#include "ldapconfig.h" +#include "ldap_defaults.h" -struct ldapoptions openldap_ldap_global_options; +struct ldapoptions ldap_int_global_options = + { LDAP_UNINITIALIZED, LDAP_DEBUG_NONE }; #undef gopts -#define gopts openldap_ldap_global_options - -int openldap_ldap_initialized = 0; +#define gopts ldap_int_global_options #define ATTR_NONE 0 #define ATTR_BOOL 1 #define ATTR_INT 2 #define ATTR_KV 3 #define ATTR_STRING 4 +#define ATTR_TLS 5 +#define ATTR_URIS 6 struct ol_keyvalue { - char* key; + const char * key; int value; }; -struct ol_keyvalue deref_kv[] = { +static const struct ol_keyvalue deref_kv[] = { {"never", LDAP_DEREF_NEVER}, {"searching", LDAP_DEREF_SEARCHING}, {"finding", LDAP_DEREF_FINDING}, @@ -36,61 +45,88 @@ struct ol_keyvalue deref_kv[] = { {NULL, 0} }; -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, + {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, 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, 0} + /* **** keep this around for backward compatibility */ + {0, ATTR_URIS, "HOST", NULL, 1}, + /* **** */ + {0, ATTR_URIS, "URI", NULL, 0}, + {0, ATTR_BOOL, "REFERRALS", NULL, LDAP_BOOL_REFERRALS}, + {0, ATTR_BOOL, "RESTART", NULL, LDAP_BOOL_RESTART}, + {0, ATTR_BOOL, "DNS", NULL, LDAP_BOOL_DNS}, + {0, ATTR_TLS, "TLS", NULL, LDAP_OPT_X_TLS}, + {0, ATTR_TLS, "TLS_CERT", NULL, LDAP_OPT_X_TLS_CERTFILE}, + {0, 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}, +#ifdef HAVE_CYRUS_SASL + {0, ATTR_INT, "SASL_MINSSF", NULL, + offsetof(struct ldapoptions, ldo_sasl_minssf)}, + {0, ATTR_INT, "SASL_MAXSSF", NULL, + offsetof(struct ldapoptions, ldo_sasl_maxssf)}, +#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 buf[MAX_LDAP_ATTR_LEN]; char linebuf[128]; FILE *fp; int i; char *cmd, *opt; char *start, *end; + 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? */ @@ -99,7 +135,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') { @@ -109,18 +145,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: @@ -128,26 +166,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; } @@ -155,33 +195,74 @@ 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_TLS: +#ifdef HAVE_TLS + ldap_pvt_tls_config( &gopts, attrs[i].offset, opt ); +#endif + 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; } + 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 = getenv("HOME"); - char *path = malloc(strlen(home) + strlen(file) + 3); + char *home; + char *path = NULL; + + if (file == NULL) { + /* no file name */ + return; + } - /* try ~/file */ - sprintf(path, "%s/%s", home, file); - openldap_ldap_init_w_conf(path); + home = getenv("HOME"); - /* try ~/.file */ - sprintf(path, "%s/.%s", home, file); - openldap_ldap_init_w_conf(path); + if (home != NULL) { + Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is %s\n", + home, 0, 0); + path = LDAP_MALLOC(strlen(home) + strlen(file) + 3); + } else { + Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is NULL\n", + 0, 0, 0); + } - /* try file */ - openldap_ldap_init_w_conf(file); + if(home != NULL && path != NULL) { + /* we assume UNIX path syntax is used... */ - /* try .file */ - sprintf(path, "%s/.%s", home, file); - openldap_ldap_init_w_conf(path); + /* try ~/file */ + sprintf(path, "%s/%s", home, file); + openldap_ldap_init_w_conf(path, 1); + + /* try ~/.file */ + sprintf(path, "%s/.%s", home, file); + openldap_ldap_init_w_conf(path, 1); + } + + if(path != NULL) { + LDAP_FREE(path); + } + + /* try file */ + openldap_ldap_init_w_conf(file, 1); } static void openldap_ldap_init_w_env(const char *prefix) @@ -193,7 +274,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); @@ -208,33 +289,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; } @@ -242,43 +323,116 @@ 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_TLS: +#ifdef HAVE_TLS + ldap_pvt_tls_config( &gopts, attrs[i].offset, value ); +#endif + 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; } } } -void openldap_ldap_initialize( void ) +void ldap_int_initialize( int *dbglvl ) { - if ( openldap_ldap_initialized ) { + if ( gopts.ldo_valid == LDAP_INITIALIZED ) { return; } + ldap_int_utils_init(); + +#ifdef HAVE_TLS + ldap_pvt_tls_init(); +#endif + +#ifdef HAVE_CYRUS_SASL + ldap_pvt_sasl_init(); +#endif + + if ( ldap_int_tblsize == 0 ) + ldap_int_ip_init(); + + 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_defhost = strdup("localhost"); + gopts.ldo_tm_api = (struct timeval *)NULL; + gopts.ldo_tm_net = (struct timeval *)NULL; + + /* 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; LDAP_BOOL_ZERO(&gopts); -#if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) || \ - LDAP_VERSION_MAX > LDAP_VERSION2 LDAP_BOOL_SET(&gopts, LDAP_BOOL_REFERRALS); + +#ifdef HAVE_TLS + gopts.ldo_tls_ctx = NULL; +#endif +#ifdef HAVE_CYRUS_SASL + gopts.ldo_sasl_minssf = 0; + gopts.ldo_sasl_maxssf = INT_MAX; #endif - openldap_ldap_init_w_conf(DEFAULT_LDAP_CONF_FILE); - openldap_ldap_init_w_userconf(DEFAULT_LDAP_USERRC_FILE); - openldap_ldap_init_w_env(NULL); + gopts.ldo_valid = LDAP_INITIALIZED; + + if( getenv("LDAPNOINIT") != NULL ) { + return; + } + + openldap_ldap_init_w_sysconf(LDAP_CONF_FILE); + openldap_ldap_init_w_userconf(LDAP_USERRC_FILE); + + { + char *altfile = getenv(LDAP_ENV_PREFIX "CONF"); - openldap_ldap_initialized = 1; + if( altfile != NULL ) { + 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(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); }