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

add creation base that defaults to the search base

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13902 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-06-02 13:06:38 +00:00
parent 1459542470
commit 31f45fb97b
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,9 +57,7 @@ struct hdbldapdb {
LDAP *h_lp; LDAP *h_lp;
int h_msgid; int h_msgid;
char *h_base; char *h_base;
#if 0
char *h_createbase; char *h_createbase;
#endif
}; };
#define HDB2LDAP(db) (((struct hdbldapdb *)(db)->hdb_db)->h_lp) #define HDB2LDAP(db) (((struct hdbldapdb *)(db)->hdb_db)->h_lp)
@@ -67,9 +65,7 @@ struct hdbldapdb {
#define HDBSETMSGID(db,msgid) \ #define HDBSETMSGID(db,msgid) \
do { ((struct hdbldapdb *)(db)->hdb_db)->h_msgid = msgid; } while(0) do { ((struct hdbldapdb *)(db)->hdb_db)->h_msgid = msgid; } while(0)
#define HDB2BASE(dn) (((struct hdbldapdb *)(db)->hdb_db)->h_base) #define HDB2BASE(dn) (((struct hdbldapdb *)(db)->hdb_db)->h_base)
#if 0
#define HDB2CREATE(db) (((struct hdbldapdb *)(db)->hdb_db)->h_createbase) #define HDB2CREATE(db) (((struct hdbldapdb *)(db)->hdb_db)->h_createbase)
#endif
/* /*
* *
@@ -1520,7 +1516,7 @@ LDAP_store(krb5_context context, HDB * db, unsigned flags,
goto out; goto out;
if (e == NULL) { if (e == NULL) {
ret = asprintf(&dn, "krb5PrincipalName=%s,%s", name, HDB2BASE(db)); ret = asprintf(&dn, "krb5PrincipalName=%s,%s", name, HDB2CREATE(db));
if (ret < 0) { if (ret < 0) {
krb5_set_error_string(context, "asprintf: out of memory"); krb5_set_error_string(context, "asprintf: out of memory");
ret = ENOMEM; ret = ENOMEM;
@@ -1629,6 +1625,8 @@ LDAP_destroy(krb5_context context, HDB * db)
ret = hdb_clear_master_key(context, db); ret = hdb_clear_master_key(context, db);
if (HDB2BASE(db)) if (HDB2BASE(db))
free(HDB2BASE(db)); free(HDB2BASE(db));
if (HDB2CREATE(db))
free(HDB2CREATE(db));
if (db->hdb_name) if (db->hdb_name)
free(db->hdb_name); free(db->hdb_name);
free(db->hdb_db); free(db->hdb_db);
@@ -1641,6 +1639,7 @@ 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)
{ {
struct hdbldapdb *h; struct hdbldapdb *h;
const char *create_base = NULL;
if (arg == NULL && arg[0] == '\0') { if (arg == NULL && arg[0] == '\0') {
krb5_set_error_string(context, "ldap search base not configured"); krb5_set_error_string(context, "ldap search base not configured");
@@ -1686,8 +1685,21 @@ hdb_ldap_create(krb5_context context, HDB ** db, const char *arg)
(*db)->hdb_db = h; (*db)->hdb_db = h;
h->h_base = strdup(arg); h->h_base = strdup(arg);
if (h->h_base == NULL) { if (h->h_base == NULL) {
LDAP_destroy(context, *db);
krb5_set_error_string(context, "strdup: out of memory");
*db = NULL;
return ENOMEM;
}
create_base = krb5_config_get_string(context, NULL, "kdc",
"hdb-ldap-create-base", NULL);
if (create_base == NULL)
create_base = h->h_base;
h->h_createbase = strdup(create_base);
if (h->h_createbase == NULL) {
LDAP_destroy(context, *db);
krb5_set_error_string(context, "strdup: out of memory"); krb5_set_error_string(context, "strdup: out of memory");
free(*db);
*db = NULL; *db = NULL;
return ENOMEM; return ENOMEM;
} }