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

abstract out adding dbinfo

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-11-22 00:24:55 -08:00
parent e5d2b6f6ad
commit c5fffce8db
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
kdc/set_dbinfo.c
View File

@@ -1,9 +1,10 @@
/*
* Copyright (c) 1997-2007 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden).
*
* All rights reserved.
*
* Portions Copyright (c) 2009 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -36,6 +37,35 @@
RCSID("$Id: default_config.c 21296 2007-06-25 14:49:11Z lha $");
static krb5_error_code
add_db(krb5_context context, struct krb5_kdc_configuration *c,
const char *conf, const char *master_key)
{
krb5_error_code ret;
void *ptr;
ptr = realloc(c->db, (c->num_db + 1) * sizeof(*c->db));
if (ptr == NULL) {
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM;
}
c->db = ptr;
ret = hdb_create(context, &c->db[c->num_db], conf);
if(ret)
return ret;
c->num_db++;
if (master_key) {
ret = hdb_set_master_keyfile(context, c->db[c->num_db - 1], master_key);
if (ret)
return ret;
}
return 0;
}
krb5_error_code
krb5_kdc_set_dbinfo(krb5_context context, struct krb5_kdc_configuration *c)
{
@@ -50,28 +80,13 @@ krb5_kdc_set_dbinfo(krb5_context context, struct krb5_kdc_configuration *c)
d = NULL;
while ((d = hdb_dbinfo_get_next(info, d)) != NULL) {
void *ptr;
ptr = realloc(c->db, (c->num_db + 1) * sizeof(*c->db));
if (ptr == NULL) {
ret = ENOMEM;
krb5_set_error_message(context, ret, "malloc: out of memory");
goto out;
}
c->db = ptr;
ret = hdb_create(context, &c->db[c->num_db],
hdb_dbinfo_get_dbname(context, d));
if(ret)
goto out;
ret = hdb_set_master_keyfile(context, c->db[c->num_db],
hdb_dbinfo_get_mkey_file(context, d));
ret = add_db(context, c,
hdb_dbinfo_get_dbname(context, d),
hdb_dbinfo_get_mkey_file(context, d));
if (ret)
goto out;
c->num_db++;
kdc_log(context, c, 0, "label: %s",
hdb_dbinfo_get_label(context, d));
kdc_log(context, c, 0, "\tdbname: %s",