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

(hdb_get_dbinfo) If there are no database specified, create one and

Browse Source 
let it use the defaults.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20576 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-05-02 22:57:48 +00:00
parent 96883b38fb
commit a3a7d46764
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/hdb/dbinfo.c
View File

@@ -91,7 +91,6 @@ hdb_get_dbinfo(krb5_context context, struct hdb_dbinfo **dbp)
const krb5_config_binding *db_binding; const krb5_config_binding *db_binding;
struct hdb_dbinfo *di, **dt, *databases; struct hdb_dbinfo *di, **dt, *databases;
const char *default_dbname = HDB_DEFAULT_DB; const char *default_dbname = HDB_DEFAULT_DB;
const char *default_mkey = HDB_DB_DIR "/m-key";
const char *default_acl = HDB_DB_DIR "/kadmind.acl"; const char *default_acl = HDB_DB_DIR "/kadmind.acl";
const char *p; const char *p;
int ret; int ret;
@@ -135,13 +134,11 @@ hdb_get_dbinfo(krb5_context context, struct hdb_dbinfo **dbp)
} }
if(databases == NULL) { if(databases == NULL) {
/* if there are none specified, use some default */ /* if there are none specified, create one and use defaults */
di = calloc(1, sizeof(*di)); di = calloc(1, sizeof(*di));
di->dbname = strdup(default_dbname);
di->mkey_file = strdup(default_mkey);
di->acl_file = strdup(default_acl);
databases = di; databases = di;
} }
for(di = databases; di; di = di->next) { for(di = databases; di; di = di->next) {
if(di->dbname == NULL) if(di->dbname == NULL)
di->dbname = strdup(default_dbname); di->dbname = strdup(default_dbname);
@@ -158,7 +155,6 @@ hdb_get_dbinfo(krb5_context context, struct hdb_dbinfo **dbp)
} }
if(di->acl_file == NULL) if(di->acl_file == NULL)
di->acl_file = strdup(default_acl); di->acl_file = strdup(default_acl);
} }
*dbp = databases; *dbp = databases;
return 0; return 0;