From d0abcebf8011465744adad873d83d382b3cb934b Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@cryptonector.com>
Date: Tue, 29 Nov 2011 11:15:07 -0600
Subject: [PATCH] Make _krb5_plugin_run_f() use krb5_plugin_register()ed
 plugins too

---
 lib/krb5/plugin.c | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/lib/krb5/plugin.c b/lib/krb5/plugin.c
index cf0ba2fd9..4b84a7e07 100644
--- a/lib/krb5/plugin.c
+++ b/lib/krb5/plugin.c
@@ -599,16 +599,14 @@ _krb5_plugin_run_f(krb5_context context,
     heim_string_t m = heim_string_create(module);
     heim_dict_t dict;
     struct iter_ctx s;
+    struct krb5_plugin *registered_plugins = NULL;
+    struct krb5_plugin *p;
+
+    /* Get registered plugins */
+    (void) _krb5_plugin_find(context, SYMBOL, name, &registered_plugins);
 
     HEIMDAL_MUTEX_lock(&plugin_mutex);
 
-    dict = heim_dict_get_value(modules, m);
-    heim_release(m);
-    if (dict == NULL) {
-	HEIMDAL_MUTEX_unlock(&plugin_mutex);
-	return KRB5_PLUGIN_NO_HANDLE;
-    }
-
     s.context = context;
     s.name = name;
     s.n = heim_string_create(name);
@@ -616,14 +614,30 @@ _krb5_plugin_run_f(krb5_context context,
     s.result = heim_array_create();
     s.func = func;
     s.userctx = userctx;
-
-    heim_dict_iterate_f(dict, search_modules, &s);
-
-    HEIMDAL_MUTEX_unlock(&plugin_mutex);
-
     s.ret = KRB5_PLUGIN_NO_HANDLE;
 
-    heim_array_iterate_f(s.result, &s, eval_results);
+    /* Get loaded plugins */
+    dict = heim_dict_get_value(modules, m);
+    heim_release(m);
+
+    /* Add loaded plugins to s.result array */
+    if (dict)
+	heim_dict_iterate_f(dict, search_modules, &s);
+
+    /* We don't need to hold plugin_mutex during plugin invocation */
+    HEIMDAL_MUTEX_unlock(&plugin_mutex);
+
+    /* Invoke registered plugins */
+    for (p = registered_plugins; p; p = p->next) {
+	if (s.ret != KRB5_PLUGIN_NO_HANDLE)
+	    break;
+	s.ret = s.func(s.context, p->symbol, NULL, s.userctx);
+    }
+    _krb5_plugin_free(registered_plugins);
+
+    /* Invoke loaded plugins */
+    if (s.ret != KRB5_PLUGIN_NO_HANDLE)
+	heim_array_iterate_f(s.result, &s, eval_results);
 
     heim_release(s.result);
     heim_release(s.n);