X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Finit.c;h=820c951e9597f44991f19bd3fc9f4ec4fcf41818;hb=bcf8f7eeb788faa25efe0ea78e66e83e9d9b4d73;hp=bc681d763305beeed622fc4625cee9fe176bcab3;hpb=5f86e47aa82e72009afac12f75905c2eb9186834;p=openldap diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index bc681d7633..820c951e95 100644 --- a/libraries/libldap/init.c +++ b/libraries/libldap/init.c @@ -1,6 +1,6 @@ /* $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" @@ -13,6 +13,8 @@ #include #include +#include + #include "ldap-int.h" #include "ldap_defaults.h" @@ -28,7 +30,7 @@ struct ldapoptions ldap_int_global_options = #define ATTR_KV 3 #define ATTR_STRING 4 #define ATTR_TLS 5 -#define ATTR_URLS 6 +#define ATTR_URIS 6 struct ol_keyvalue { const char * key; @@ -44,41 +46,51 @@ static const struct ol_keyvalue deref_kv[] = { }; static const struct ol_attribute { + int useronly; int type; 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_INT, "PORT", NULL, + {0, ATTR_INT, "PORT", NULL, offsetof(struct ldapoptions, ldo_defport)}, /* **** keep this around for backward compatibility */ - {ATTR_URLS, "HOST", NULL, 1}, + {0, ATTR_URIS, "HOST", NULL, 1}, /* **** */ - {ATTR_URLS, "URL", NULL, 0}, - {ATTR_BOOL, "REFERRALS", NULL, LDAP_BOOL_REFERRALS}, - {ATTR_BOOL, "RESTART", NULL, LDAP_BOOL_RESTART}, - {ATTR_BOOL, "DNS", NULL, LDAP_BOOL_DNS}, - {ATTR_TLS, "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} + {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("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; @@ -91,12 +103,16 @@ static void openldap_ldap_init_w_conf(const char *file) 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; @@ -129,13 +145,17 @@ static void openldap_ldap_init_w_conf(const char *file) *start++ = '\0'; - /* we must have some non-whitespace to skip */ + /* 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( !userconf && attrs[i].useronly ) { + continue; + } + if(strcasecmp(cmd, attrs[i].name) != 0) { continue; } @@ -184,7 +204,7 @@ static void openldap_ldap_init_w_conf(const char *file) ldap_pvt_tls_config( &gopts, attrs[i].offset, opt ); #endif break; - case ATTR_URLS: + case ATTR_URIS: if (attrs[i].offset == 0) { ldap_set_option( NULL, LDAP_OPT_URI, opt ); } else { @@ -192,16 +212,22 @@ static void openldap_ldap_init_w_conf(const char *file) } 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 */ @@ -211,9 +237,12 @@ static void openldap_ldap_init_w_userconf(const char *file) 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) { @@ -221,11 +250,11 @@ 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) { @@ -233,7 +262,7 @@ static void openldap_ldap_init_w_userconf(const char *file) } /* 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) @@ -307,7 +336,7 @@ static void openldap_ldap_init_w_env(const char *prefix) ldap_pvt_tls_config( &gopts, attrs[i].offset, value ); #endif break; - case ATTR_URLS: + case ATTR_URIS: if (attrs[i].offset == 0) { ldap_set_option( NULL, LDAP_OPT_URI, value ); } else { @@ -318,7 +347,7 @@ static void openldap_ldap_init_w_env(const char *prefix) } } -void ldap_int_initialize( void ) +void ldap_int_initialize( int *dbglvl ) { if ( gopts.ldo_valid == LDAP_INITIALIZED ) { return; @@ -330,9 +359,16 @@ void ldap_int_initialize( void ) 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; @@ -343,6 +379,9 @@ void ldap_int_initialize( void ) 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; @@ -355,6 +394,10 @@ void ldap_int_initialize( void ) #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 gopts.ldo_valid = LDAP_INITIALIZED; @@ -362,23 +405,33 @@ void ldap_int_initialize( void ) return; } - openldap_ldap_init_w_conf(LDAP_CONF_FILE); + 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 ) { - 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(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);