[PATCH v3] Support for Heimdal's unified krb5 and hdb plugin system.

[Jelmer Vernooij]

Reviewed-By: Jelmer Vernooij <jelmer at samba.org>

Cheers,

Jelmer

On Sat, Jan 11, 2014 at 01:46:31PM +1300, Andrew Bartlett wrote:
> Thanks for your patience on this.  Reviewed-by: Andrew Bartlett
> <abartlet at samba.org>.  Jelmer, can you review/push?
> 
> On Fri, 2014-01-10 at 17:15 -0600, Jeffrey Clark wrote:
> > Fixes exportkeytab and a kdc crash when building against heimdal master.
> > 
> > Bug-Debian: http://bugs.debian.org/732342
> > ---
> >  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 9135df8..d7d44c3 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&<address>' 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
> >  };
> 
> -- 
> Andrew Bartlett                       http://samba.org/~abartlet/
> Authentication Developer, Samba Team  http://samba.org
> Samba Developer, Catalyst IT          http://catalyst.net.nz/services/samba
> 
> 

--