oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Add support for specifying an LDAP URL.

Browse Source 
Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
This commit is contained in:
Landon Fuller
2013-04-17 12:45:43 -04:00
committed by Love Hornquist Astrand
parent 9bde530ceb
commit e58308e2a6
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/hdb/hdb-ldap.c
View File

@@ -50,6 +50,7 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
static const char *default_structural_object = "account"; static const char *default_structural_object = "account";
static char *structural_object; static char *structural_object;
static const char *default_ldap_url = "ldapi:///";
static krb5_boolean samba_forwardable; static krb5_boolean samba_forwardable;
struct hdbldapdb { struct hdbldapdb {
@@ -1806,6 +1807,19 @@ hdb_ldap_common(krb5_context context,
{ {
struct hdbldapdb *h; struct hdbldapdb *h;
const char *create_base = NULL; const char *create_base = NULL;
char *ldap_url = NULL;
if (url == NULL || url[0] == '\0') {
const char *p;
p = krb5_config_get_string(context, NULL, "kdc",
"hdb-ldap-url", NULL);
if (p == NULL)
p = default_ldap_url;
ldap_url = strdup(p);
} else {
ldap_url = strdup(url);
}
if (search_base == NULL && search_base[0] == '\0') { if (search_base == NULL && search_base[0] == '\0') {
krb5_set_error_message(context, ENOMEM, "ldap search base not configured"); krb5_set_error_message(context, ENOMEM, "ldap search base not configured");
@@ -1854,7 +1868,7 @@ hdb_ldap_common(krb5_context context,
return ENOMEM; return ENOMEM;
} }
h->h_url = strdup(url); h->h_url = strdup(ldap_url);
h->h_base = strdup(search_base); h->h_base = strdup(search_base);
if (h->h_url == NULL || h->h_base == NULL) { if (h->h_url == NULL || h->h_base == NULL) {
LDAP_destroy(context, *db); LDAP_destroy(context, *db);
@@ -1900,7 +1914,7 @@ hdb_ldap_common(krb5_context context,
krb5_error_code krb5_error_code
hdb_ldap_create(krb5_context context, HDB ** db, const char *arg) hdb_ldap_create(krb5_context context, HDB ** db, const char *arg)
{ {
return hdb_ldap_common(context, db, arg, "ldapi:///"); return hdb_ldap_common(context, db, arg, NULL);
} }
krb5_error_code krb5_error_code