From 368208069e33a6d9b78a90f7326d5ac1bdd204f7 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Fri, 10 Jan 2014 17:20:14 -0600 Subject: [PATCH] Support for Heimdal's unified krb5 and hdb plugin system. Fixes exportkeytab and a kdc crash when building against heimdal master. Bug-Debian: http://bugs.debian.org/732342 Reviewed-by: Andrew Bartlett Reviewed-by: Jelmer Vernooij --- source4/kdc/hdb-samba4-plugin.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/source4/kdc/hdb-samba4-plugin.c b/source4/kdc/hdb-samba4-plugin.c index 9135df8f78e..cc38a60152a 100644 --- a/source4/kdc/hdb-samba4-plugin.c +++ b/source4/kdc/hdb-samba4-plugin.c @@ -70,6 +70,18 @@ static krb5_error_code hdb_samba4_create(krb5_context context, struct HDB **db, return EINVAL; } +#if HDB_INTERFACE_VERSION >= 8 +static krb5_error_code hdb_samba4_init(krb5_context context, void **ctx) +{ + *ctx = NULL; + return 0; +} + +static void hdb_samba4_fini(void *ctx) +{ +} +#endif + /* Only used in the hdb-backed keytab code * for a keytab of 'samba4&
' or samba4, to find * kpasswd's key in the main DB, and to @@ -79,6 +91,10 @@ static krb5_error_code hdb_samba4_create(krb5_context context, struct HDB **db, */ struct hdb_method hdb_samba4_interface = { HDB_INTERFACE_VERSION, +#if HDB_INTERFACE_VERSION >= 8 + .init = hdb_samba4_init, + .fini = hdb_samba4_fini, +#endif .prefix = "samba4", .create = hdb_samba4_create }; -- 2.11.4.GIT