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

simplify

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-10-27 20:48:55 -07:00
parent edc1c3e2a1
commit e0a1e0a806
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/krb5/plugin.c
View File

@@ -558,28 +558,23 @@ _krb5_plugin_run_f(krb5_context context,
krb5_error_code (*func)(krb5_context, const void *, void *, void *)) krb5_error_code (*func)(krb5_context, const void *, void *, void *))
{ {
heim_string_t m = heim_string_create(module); heim_string_t m = heim_string_create(module);
heim_string_t n = heim_string_create(name);
heim_array_t result;
heim_dict_t dict; heim_dict_t dict;
struct iter_ctx s; struct iter_ctx s;
result = heim_array_create();
HEIMDAL_MUTEX_lock(&plugin_mutex); HEIMDAL_MUTEX_lock(&plugin_mutex);
dict = heim_dict_copy_value(modules, m); dict = heim_dict_copy_value(modules, m);
heim_release(m); heim_release(m);
if (dict == NULL) { if (dict == NULL) {
HEIMDAL_MUTEX_unlock(&plugin_mutex); HEIMDAL_MUTEX_unlock(&plugin_mutex);
heim_release(n);
return KRB5_PLUGIN_NO_HANDLE; return KRB5_PLUGIN_NO_HANDLE;
} }
s.context = context; s.context = context;
s.name = name; s.name = name;
s.n = n; s.n = heim_string_create(name);
s.min_version = min_version; s.min_version = min_version;
s.result = result; s.result = heim_array_create();
s.func = func; s.func = func;
s.userctx = userctx; s.userctx = userctx;
@@ -591,10 +586,10 @@ _krb5_plugin_run_f(krb5_context context,
s.ret = KRB5_PLUGIN_NO_HANDLE; s.ret = KRB5_PLUGIN_NO_HANDLE;
heim_array_iterate_f(result, eval_results, &s); heim_array_iterate_f(s.result, eval_results, &s);
heim_release(result); heim_release(s.result);
heim_release(n); heim_release(s.n);
return s.ret; return s.ret;
} }