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

Provide a more standard way to produce hdb plugins. From Andrew Bartlett

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24030 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-11-12 04:19:00 +00:00
parent 06e31e6376
commit 1dd8ec4fe7
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/hdb/hdb.c
View File

@@ -31,34 +31,27 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include "krb5.h"
#include "krb5_locl.h"
#include "hdb_locl.h" #include "hdb_locl.h"
RCSID("$Id$"); RCSID("$Id$");
#ifdef HAVE_DLFCN_H #ifdef HAVE_DLFCN_H
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
struct hdb_method {
const char *prefix;
krb5_error_code (*create)(krb5_context, HDB **, const char *filename);
};
static struct hdb_method methods[] = { static struct hdb_method methods[] = {
#if HAVE_DB1 || HAVE_DB3 #if HAVE_DB1 || HAVE_DB3
{"db:", hdb_db_create}, { HDB_INTERFACE_VERSION, "db:", hdb_db_create},
#endif #endif
#if HAVE_NDBM #if HAVE_NDBM
{"ndbm:", hdb_ndbm_create}, { HDB_INTERFACE_VERSION, "ndbm:", hdb_ndbm_create},
#endif #endif
#if defined(OPENLDAP) && !defined(OPENLDAP_MODULE) #if defined(OPENLDAP) && !defined(OPENLDAP_MODULE)
{"ldap:", hdb_ldap_create}, { HDB_INTERFACE_VERSION, "ldap:", hdb_ldap_create},
{"ldapi:", hdb_ldapi_create}, { HDB_INTERFACE_VERSION, "ldapi:", hdb_ldapi_create},
#endif #endif
#ifdef HAVE_LDB /* Used for integrated samba build */ {0, NULL, NULL}
{"ldb:", hdb_ldb_create},
#endif
{NULL, NULL}
}; };
#if HAVE_DB1 || HAVE_DB3 #if HAVE_DB1 || HAVE_DB3
@@ -398,11 +391,32 @@ hdb_create(krb5_context context, HDB **db, const char *filename)
{ {
const struct hdb_method *h; const struct hdb_method *h;
const char *residual; const char *residual;
krb5_error_code ret;
struct krb5_plugin *list = NULL, *e;
if(filename == NULL) if(filename == NULL)
filename = HDB_DEFAULT_DB; filename = HDB_DEFAULT_DB;
krb5_add_et_list(context, initialize_hdb_error_table_r); krb5_add_et_list(context, initialize_hdb_error_table_r);
h = find_method (filename, &residual); h = find_method (filename, &residual);
if (h == NULL) {
ret = _krb5_plugin_find(context, PLUGIN_TYPE_DATA, "hdb", &list);
if(ret == 0 && list != NULL) {
for (e = list; e != NULL; e = _krb5_plugin_get_next(e)) {
h = _krb5_plugin_get_symbol(e);
if (strncmp (filename, h->prefix, strlen(h->prefix)) == 0
&& h->interface_version == HDB_INTERFACE_VERSION) {
residual = filename + strlen(h->prefix);
break;
}
}
if (e == NULL) {
h = NULL;
_krb5_plugin_free(list);
}
}
}
#ifdef HAVE_DLOPEN #ifdef HAVE_DLOPEN
if (h == NULL) if (h == NULL)
h = find_dynamic_method (context, filename, &residual); h = find_dynamic_method (context, filename, &residual);

6
lib/hdb/hdb.h
View File

@@ -139,6 +139,12 @@ typedef krb5_error_code (*hdb_foreach_func_t)(krb5_context, HDB*,
hdb_entry_ex*, void*); hdb_entry_ex*, void*);
extern krb5_kt_ops hdb_kt_ops; extern krb5_kt_ops hdb_kt_ops;
struct hdb_method {
int interface_version;
const char *prefix;
krb5_error_code (*create)(krb5_context, HDB **, const char *filename);
};
#include <hdb-protos.h> #include <hdb-protos.h>
#endif /* __HDB_H__ */ #endif /* __HDB_H__ */