+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
#include "portable.h"
#include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
#include <ac/socket.h>
#include <ac/string.h>
+#include <ac/ctype.h>
#include <ac/time.h>
#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
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},
{NULL, 0}
};
-struct ol_attribute {
+static const struct ol_attribute {
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] */
offsetof(struct ldapoptions, ldo_defhost)},
{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_BOOL, "REFERRALS", NULL, LDAP_BOOL_REFERRALS},
+ {ATTR_BOOL, "RESTART", NULL, LDAP_BOOL_RESTART},
+ {ATTR_BOOL, "DNS", NULL, LDAP_BOOL_DNS},
+ {ATTR_BOOL, "TLS", NULL, LDAP_OPT_X_TLS},
+ {ATTR_TLS, "TLS_CERT", NULL, LDAP_OPT_X_TLS_CERTFILE},
+ {ATTR_TLS, "TLS_KEY", NULL, LDAP_OPT_X_TLS_KEYFILE},
+ {ATTR_TLS, "TLS_CACERT", NULL, LDAP_OPT_X_TLS_CACERTFILE},
+ {ATTR_TLS, "TLS_CACERTDIR",NULL, LDAP_OPT_X_TLS_CACERTDIR},
+ {ATTR_TLS, "TLS_REQCERT", NULL, LDAP_OPT_X_TLS_REQUIRE_CERT},
{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)
char *cmd, *opt;
char *start, *end;
+ if (file == NULL) {
+ /* no file name */
+ return;
+ }
+
fp = fopen(file, "r");
if(fp == NULL) {
/* could not open file */
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? */
/* parse the command */
cmd=start;
- while((*start != '\0') && !isspace(*start)) {
+ while((*start != '\0') && !isspace((unsigned char)*start)) {
start++;
}
if(*start == '\0') {
*start++ = '\0';
/* we must have some non-whitespace to skip */
- while(isspace(*start)) start++;
+ while(isspace((unsigned char)*start)) start++;
opt = start;
for(i=0; attrs[i].type != ATTR_NONE; i++) {
continue;
}
- p = &((char *) &gopts)[attrs[i].offset];
-
switch(attrs[i].type) {
case ATTR_BOOL:
if((strcasecmp(opt, "on") == 0)
|| (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;
}
} 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;
}
}
}
+
+ fclose(fp);
}
static void openldap_ldap_init_w_userconf(const char *file)
{
- char *home = getenv("HOME");
+ char *home;
char *path;
-
+
+ if (file == NULL) {
+ /* no file name */
+ return;
+ }
+
+ home = getenv("HOME");
+
if (home != NULL) {
- path = malloc(strlen(home) + strlen(file) + 3);
+ path = LDAP_MALLOC(strlen(home) + strlen(file) + 3);
} else {
- path = malloc(strlen(file) + 3);
+ path = LDAP_MALLOC(strlen(file) + 3);
}
-
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);
openldap_ldap_init_w_conf(path);
}
+ if(path != NULL) {
+ LDAP_FREE(path);
+ }
+
/* try file */
openldap_ldap_init_w_conf(file);
-
- if(path == NULL) {
- /* try .file */
- sprintf(path, ".%s", file);
- openldap_ldap_init_w_conf(path);
- }
}
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);
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;
}
} 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( attrs[i].offset, value );
+#endif
+ break;
}
}
}
-void openldap_ldap_initialize( void )
+void ldap_int_initialize( void )
{
- if ( openldap_ldap_initialized ) {
+ if ( gopts.ldo_valid == LDAP_INITIALIZED ) {
return;
}
+ ldap_int_utils_init();
+
+#ifdef HAVE_TLS
+ ldap_pvt_tls_init();
+#endif
+
+ if ( ldap_int_tblsize == 0 )
+ ldap_int_ip_init();
+
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_debug = 0;
+
+ gopts.ldo_defhost = LDAP_STRDUP("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
- 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_conf(LDAP_CONF_FILE);
+ openldap_ldap_init_w_userconf(LDAP_USERRC_FILE);
+
+ {
+ char *altfile = getenv(LDAP_ENV_PREFIX "CONF");
+
+ if( altfile != NULL ) {
+ openldap_ldap_init_w_conf( altfile );
+ }
+ }
- openldap_ldap_initialized = 1;
+ {
+ char *altfile = getenv(LDAP_ENV_PREFIX "RC");
+
+ if( altfile != NULL ) {
+ openldap_ldap_init_w_userconf( altfile );
+ }
+ }
+
+ openldap_ldap_init_w_env(NULL);
}
projects / openldap / blobdiff