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

coverity 1164086

Browse Source
This commit is contained in:
Nicolas Williams
2015-04-18 22:42:00 -05:00
parent f1fca8be14
commit b6e4d25d0d
1 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/kadm5/context_s.c
View File

@@ -144,20 +144,32 @@ find_db_spec(kadm5_server_context *ctx)
continue; continue;
p = hdb_dbinfo_get_dbname(context, d); p = hdb_dbinfo_get_dbname(context, d);
if (p) if (p) {
ctx->config.dbname = strdup(p); ctx->config.dbname = strdup(p);
if (ctx->config.dbname == NULL)
return ENOMEM;
}
p = hdb_dbinfo_get_acl_file(context, d); p = hdb_dbinfo_get_acl_file(context, d);
if (p) if (p) {
ctx->config.acl_file = strdup(p); ctx->config.acl_file = strdup(p);
if (ctx->config.acl_file == NULL)
return ENOMEM;
}
p = hdb_dbinfo_get_mkey_file(context, d); p = hdb_dbinfo_get_mkey_file(context, d);
if (p) if (p) {
ctx->config.stash_file = strdup(p); ctx->config.stash_file = strdup(p);
if (ctx->config.stash_file == NULL)
return ENOMEM;
}
p = hdb_dbinfo_get_log_file(context, d); p = hdb_dbinfo_get_log_file(context, d);
if (p) if (p) {
ctx->log_context.log_file = strdup(p); ctx->log_context.log_file = strdup(p);
if (ctx->log_context.log_file == NULL)
return ENOMEM;
}
break; break;
} }
hdb_free_dbinfo(context, &info); hdb_free_dbinfo(context, &info);
@@ -165,8 +177,11 @@ find_db_spec(kadm5_server_context *ctx)
/* If any of the values was unset, pick up the default value */ /* If any of the values was unset, pick up the default value */
if (ctx->config.dbname == NULL) if (ctx->config.dbname == NULL) {
ctx->config.dbname = strdup(hdb_default_db(context)); ctx->config.dbname = strdup(hdb_default_db(context));
if (ctx->config.dbname == NULL)
return ENOMEM;
}
if (ctx->config.acl_file == NULL) { if (ctx->config.acl_file == NULL) {
aret = asprintf(&ctx->config.acl_file, "%s/kadmind.acl", aret = asprintf(&ctx->config.acl_file, "%s/kadmind.acl",
hdb_db_dir(context)); hdb_db_dir(context));
@@ -200,6 +215,7 @@ _kadm5_s_init_context(kadm5_server_context **ctx,
kadm5_config_params *params, kadm5_config_params *params,
krb5_context context) krb5_context context)
{ {
kadm5_ret_t ret = 0;
*ctx = malloc(sizeof(**ctx)); *ctx = malloc(sizeof(**ctx));
if(*ctx == NULL) if(*ctx == NULL)
return ENOMEM; return ENOMEM;
@@ -208,16 +224,30 @@ _kadm5_s_init_context(kadm5_server_context **ctx,
(*ctx)->context = context; (*ctx)->context = context;
krb5_add_et_list (context, initialize_kadm5_error_table_r); krb5_add_et_list (context, initialize_kadm5_error_table_r);
#define is_set(M) (params && params->mask & KADM5_CONFIG_ ## M) #define is_set(M) (params && params->mask & KADM5_CONFIG_ ## M)
if(is_set(REALM)) if (is_set(REALM)) {
(*ctx)->config.realm = strdup(params->realm); (*ctx)->config.realm = strdup(params->realm);
else if ((*ctx)->config.realm == NULL)
krb5_get_default_realm(context, &(*ctx)->config.realm); return ENOMEM;
if(is_set(DBNAME)) } else {
ret = krb5_get_default_realm(context, &(*ctx)->config.realm);
if (ret)
return ret;
}
if (is_set(DBNAME)) {
(*ctx)->config.dbname = strdup(params->dbname); (*ctx)->config.dbname = strdup(params->dbname);
if(is_set(ACL_FILE)) if ((*ctx)->config.dbname == NULL)
return ENOMEM;
}
if (is_set(ACL_FILE)) {
(*ctx)->config.acl_file = strdup(params->acl_file); (*ctx)->config.acl_file = strdup(params->acl_file);
if(is_set(STASH_FILE)) if ((*ctx)->config.acl_file == NULL)
return ENOMEM;
}
if (is_set(STASH_FILE)) {
(*ctx)->config.stash_file = strdup(params->stash_file); (*ctx)->config.stash_file = strdup(params->stash_file);
if ((*ctx)->config.stash_file == NULL)
return ENOMEM;
}
find_db_spec(*ctx); find_db_spec(*ctx);