/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "portable.h"
#include <ac/ctype.h>
#include <ac/time.h>
+#include <limits.h>
+
#include "ldap-int.h"
#include "ldap_defaults.h"
struct ldapoptions ldap_int_global_options =
{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE };
-#undef gopts
-#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
+#define ATTR_OPTION 5
+
+#define ATTR_SASL 6
+#define ATTR_TLS 7
struct ol_keyvalue {
const char * key;
offsetof(struct ldapoptions, ldo_defbinddn)},
{0, ATTR_STRING, "BASE", NULL,
offsetof(struct ldapoptions, ldo_defbase)},
- {0, ATTR_INT, "PORT", NULL,
+ {0, ATTR_INT, "PORT", NULL, /* deprecated */
offsetof(struct ldapoptions, ldo_defport)},
- /* **** keep this around for backward compatibility */
- {0, ATTR_URIS, "HOST", NULL, 1},
- /* **** */
- {0, ATTR_URIS, "URI", NULL, 0},
+ {0, ATTR_OPTION, "HOST", NULL, LDAP_OPT_HOST_NAME}, /* deprecated */
+ {0, ATTR_OPTION, "URI", NULL, LDAP_OPT_URI}, /* replaces HOST/PORT */
{0, ATTR_BOOL, "REFERRALS", NULL, LDAP_BOOL_REFERRALS},
{0, ATTR_BOOL, "RESTART", NULL, LDAP_BOOL_RESTART},
- {0, ATTR_BOOL, "DNS", NULL, LDAP_BOOL_DNS},
+
+#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},
- {0, ATTR_TLS, "TLS_CERT", NULL, LDAP_OPT_X_TLS_CERTFILE},
- {0, ATTR_TLS, "TLS_KEY", NULL, LDAP_OPT_X_TLS_KEYFILE},
+ {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},
-#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)},
+ {0, ATTR_TLS, "TLS_RANDFILE", NULL, LDAP_OPT_X_TLS_RANDOM_FILE},
#endif
+
{0, ATTR_NONE, NULL, NULL, 0}
};
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;
|| (strcasecmp(opt, "yes") == 0)
|| (strcasecmp(opt, "true") == 0))
{
- LDAP_BOOL_SET(&gopts, attrs[i].offset);
+ LDAP_BOOL_SET(gopts, attrs[i].offset);
} else {
- LDAP_BOOL_CLR(&gopts, attrs[i].offset);
+ LDAP_BOOL_CLR(gopts, attrs[i].offset);
}
break;
case ATTR_INT:
- p = &((char *) &gopts)[attrs[i].offset];
+ p = &((char *) gopts)[attrs[i].offset];
* (int*) p = atoi(opt);
break;
kv++) {
if(strcasecmp(opt, kv->key) == 0) {
- p = &((char *) &gopts)[attrs[i].offset];
+ p = &((char *) gopts)[attrs[i].offset];
* (int*) p = kv->value;
break;
}
} break;
case ATTR_STRING:
- p = &((char *) &gopts)[attrs[i].offset];
+ p = &((char *) gopts)[attrs[i].offset];
if (* (char**) p != NULL) LDAP_FREE(* (char**) p);
* (char**) p = LDAP_STRDUP(opt);
break;
+ case ATTR_OPTION:
+ ldap_set_option( NULL, attrs[i].offset, 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_pvt_tls_config( &gopts, attrs[i].offset, opt );
+ ldap_int_tls_config( NULL, 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;
}
}
static void openldap_ldap_init_w_userconf(const char *file)
{
char *home;
- char *path;
+ char *path = NULL;
if (file == NULL) {
/* no file name */
home = getenv("HOME");
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 {
- path = LDAP_MALLOC(strlen(file) + 3);
+ Debug(LDAP_DEBUG_TRACE, "ldap_init: HOME env is NULL\n",
+ 0, 0, 0);
}
if(home != NULL && path != NULL) {
/* we assume UNIX path syntax is used... */
/* try ~/file */
- sprintf(path, "%s/%s", home, file);
+ sprintf(path, "%s%s%s", home, LDAP_DIRSEP, file);
openldap_ldap_init_w_conf(path, 1);
/* try ~/.file */
- sprintf(path, "%s/.%s", home, file);
+ sprintf(path, "%s%s.%s", home, LDAP_DIRSEP, file);
openldap_ldap_init_w_conf(path, 1);
}
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;
|| (strcasecmp(value, "yes") == 0)
|| (strcasecmp(value, "true") == 0))
{
- LDAP_BOOL_SET(&gopts, attrs[i].offset);
+ LDAP_BOOL_SET(gopts, attrs[i].offset);
} else {
- LDAP_BOOL_CLR(&gopts, attrs[i].offset);
+ LDAP_BOOL_CLR(gopts, attrs[i].offset);
}
break;
case ATTR_INT:
- p = &((char *) &gopts)[attrs[i].offset];
+ p = &((char *) gopts)[attrs[i].offset];
* (int*) p = atoi(value);
break;
kv++) {
if(strcasecmp(value, kv->key) == 0) {
- p = &((char *) &gopts)[attrs[i].offset];
+ p = &((char *) gopts)[attrs[i].offset];
* (int*) p = kv->value;
break;
}
} break;
case ATTR_STRING:
- p = &((char *) &gopts)[attrs[i].offset];
+ p = &((char *) gopts)[attrs[i].offset];
if (* (char**) p != NULL) LDAP_FREE(* (char**) p);
if (*value == '\0') {
* (char**) p = NULL;
* (char**) p = LDAP_STRDUP(value);
}
break;
+ case ATTR_OPTION:
+ ldap_set_option( NULL, attrs[i].offset, 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_pvt_tls_config( &gopts, attrs[i].offset, value );
+ ldap_int_tls_config( NULL, 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 ldap_int_initialize( void )
+static void
+ldap_int_destroy_global_options(void)
{
- if ( gopts.ldo_valid == LDAP_INITIALIZED ) {
- return;
+ struct ldapoptions *gopts = LDAP_INT_GLOBAL_OPT();
+
+ if ( gopts->ldo_defludp ) {
+ ldap_free_urllist( gopts->ldo_defludp );
+ gopts->ldo_defludp = NULL;
}
+#if defined(HAVE_WINSOCK) || defined(HAVE_WINSOCK2)
+ WSACleanup( );
+#endif
+}
- ldap_int_utils_init();
+/*
+ * Initialize the global options structure with default values.
+ */
+void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl )
+{
+ if (dbglvl)
+ gopts->ldo_debug = *dbglvl;
+ else
+ gopts->ldo_debug = 0;
-#ifdef HAVE_TLS
- ldap_pvt_tls_init();
-#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_CYRUS_SASL
- ldap_pvt_sasl_init();
-#endif
+ gopts->ldo_tm_api = (struct timeval *)NULL;
+ gopts->ldo_tm_net = (struct timeval *)NULL;
- if ( ldap_int_tblsize == 0 )
- ldap_int_ip_init();
+ /* ldo_defludp wll be freed by the atexit() handler
+ */
+ ldap_url_parselist(&gopts->ldo_defludp, "ldap://localhost/");
+ gopts->ldo_defport = LDAP_PORT;
+ atexit(ldap_int_destroy_global_options);
- gopts.ldo_debug = 0;
+ gopts->ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
+ gopts->ldo_rebind_proc = NULL;
+ gopts->ldo_rebind_params = NULL;
- gopts.ldo_version = LDAP_VERSION2;
- gopts.ldo_deref = LDAP_DEREF_NEVER;
- gopts.ldo_timelimit = LDAP_NO_LIMIT;
- gopts.ldo_sizelimit = LDAP_NO_LIMIT;
+ LDAP_BOOL_ZERO(gopts);
- gopts.ldo_tm_api = (struct timeval *)NULL;
- gopts.ldo_tm_net = (struct timeval *)NULL;
+ LDAP_BOOL_SET(gopts, LDAP_BOOL_REFERRALS);
- /* 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;
+#ifdef LDAP_CONNECTIONLESS
+ gopts->ldo_peer = NULL;
+ gopts->ldo_cldapdn = NULL;
+ gopts->ldo_is_udp = 0;
+#endif
- gopts.ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
+#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 = SASL_MAX_BUFF_SIZE;
+ gopts->ldo_sasl_secprops.security_flags =
+ SASL_SEC_NOPLAINTEXT | SASL_SEC_NOANONYMOUS;
+#endif
- LDAP_BOOL_ZERO(&gopts);
+ gopts->ldo_valid = LDAP_INITIALIZED;
+ return;
+}
- LDAP_BOOL_SET(&gopts, LDAP_BOOL_REFERRALS);
+#if defined(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND) \
+ || defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
+char * ldap_int_hostname = NULL;
+#endif
-#ifdef HAVE_TLS
- gopts.ldo_tls_ctx = NULL;
+void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
+{
+ if ( gopts->ldo_valid == LDAP_INITIALIZED ) {
+ return;
+ }
+
+ ldap_int_error_init();
+
+#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
-#ifdef HAVE_CYRUS_SASL
- gopts.ldo_sasl_minssf = 0;
- gopts.ldo_sasl_maxssf = INT_MAX;
+
+#ifdef HAVE_WINSOCK2
+{ WORD wVersionRequested;
+ WSADATA wsaData;
+
+ wVersionRequested = MAKEWORD( 2, 0 );
+ if ( WSAStartup( wVersionRequested, &wsaData ) != 0 ) {
+ /* Tell the user that we couldn't find a usable */
+ /* WinSock DLL. */
+ return;
+ }
+
+ /* Confirm that the WinSock DLL supports 2.0.*/
+ /* Note that if the DLL supports versions greater */
+ /* than 2.0 in addition to 2.0, it will still return */
+ /* 2.0 in wVersion since that is the version we */
+ /* requested. */
+
+ if ( LOBYTE( wsaData.wVersion ) != 2 ||
+ HIBYTE( wsaData.wVersion ) != 0 )
+ {
+ /* Tell the user that we couldn't find a usable */
+ /* WinSock DLL. */
+ WSACleanup( );
+ return;
+ }
+} /* The WinSock DLL is acceptable. Proceed. */
+#elif HAVE_WINSOCK
+{ WSADATA wsaData;
+ if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
+ return;
+ }
+}
#endif
+ ldap_int_utils_init();
- gopts.ldo_valid = LDAP_INITIALIZED;
+ if ( ldap_int_tblsize == 0 )
+ ldap_int_ip_init();
+
+ ldap_int_initialize_global_options(gopts, NULL);
if( getenv("LDAPNOINIT") != NULL ) {
return;
}
+#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 ) {
+ gopts->ldo_def_sasl_authcid = user;
+ }
+ }
+#endif
+
openldap_ldap_init_w_sysconf(LDAP_CONF_FILE);
openldap_ldap_init_w_userconf(LDAP_USERRC_FILE);
char *altfile = getenv(LDAP_ENV_PREFIX "CONF");
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);
+ openldap_ldap_init_w_env(gopts, NULL);
+
+ ldap_int_sasl_init();
}
projects / openldap / blobdiff