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

Misc fixes (coverity)

Browse Source
This commit is contained in:
Nicolas Williams
2016-11-20 17:43:07 -06:00
parent 6696920d9e
commit f38089257b
19 changed files with 105 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/hdb/dbinfo.c
View File

@@ -108,11 +108,9 @@ hdb_get_dbinfo(krb5_context context, struct hdb_dbinfo **dbp)
NULL);
if (db_binding) {
ret = get_dbinfo(context, db_binding, "default", &di);
if (ret == 0 && di) {
databases = di;
dt = &di->next;
}
ret = get_dbinfo(context, db_binding, "default", &databases);
if (ret == 0 && databases != NULL)
dt = &databases->next;
for ( ; db_binding != NULL; db_binding = db_binding->next) {
@@ -129,27 +127,28 @@ hdb_get_dbinfo(krb5_context context, struct hdb_dbinfo **dbp)
if (dt)
*dt = di;
else
else {
hdb_free_dbinfo(context, &databases);
databases = di;
}
dt = &di->next;
}
}
if(databases == NULL) {
if (databases == NULL) {
/* if there are none specified, create one and use defaults */
di = calloc(1, sizeof(*di));
databases = di;
di->label = strdup("default");
databases = calloc(1, sizeof(*databases));
databases->label = strdup("default");
}
for(di = databases; di; di = di->next) {
if(di->dbname == NULL) {
for (di = databases; di; di = di->next) {
if (di->dbname == NULL) {
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, '.');
if(p == NULL || strchr(p, '/') != NULL)
/* final pathname component does not contain a . */
@@ -159,8 +158,10 @@ hdb_get_dbinfo(krb5_context context, struct hdb_dbinfo **dbp)
.mkey */
ret = asprintf(&di->mkey_file, "%.*s.mkey",
(int)(p - di->dbname), di->dbname);
if (ret == -1)
if (ret == -1) {
hdb_free_dbinfo(context, &databases);
return ENOMEM;
}
}
if(di->acl_file == NULL)
di->acl_file = strdup(default_acl);