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

If there is no default dbname, also check for unset mkey_file and set

Browse Source 
it default mkey name, make backward compat stuff work.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20979 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-07 16:17:05 +00:00
parent 501beea27a
commit ec9707b58d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/hdb/dbinfo.c
View File

@@ -91,6 +91,7 @@ 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;
@@ -140,8 +141,11 @@ hdb_get_dbinfo(krb5_context context, struct hdb_dbinfo **dbp)
} }
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);
if (di->mkey_file == NULL)
di->mkey_file = strdup(default_mkey);
}
if(di->mkey_file == NULL) { if(di->mkey_file == NULL) {
p = strrchr(di->dbname, '.'); p = strrchr(di->dbname, '.');
if(p == NULL || strchr(p, '/') != NULL) if(p == NULL || strchr(p, '/') != NULL)