#define ATTR_KV 3
#define ATTR_STRING 4
#define ATTR_TLS 5
+#define ATTR_URIS 6
struct ol_keyvalue {
const char * key;
};
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,
+ {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", 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}
+ /* **** 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},
+ {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;
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;
}
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;
}
}
}
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;
/* 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) {
}
/* 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)
break;
case ATTR_TLS:
#ifdef HAVE_TLS
- ldap_pvt_tls_config( attrs[i].offset, value );
+ 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;
}
}
}
gopts.ldo_tm_api = (struct timeval *)NULL;
gopts.ldo_tm_net = (struct timeval *)NULL;
- gopts.ldo_defhost = LDAP_STRDUP("localhost");
+ ldap_url_parselist(&gopts.ldo_defludp, "ldap://localhost/");
gopts.ldo_defport = LDAP_PORT;
gopts.ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
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 );
+ openldap_ldap_init_w_sysconf( altfile );
}
}