Master build breaks --without-ad-dc and bundled heimdal

[Alexander Bokovoy]

On Thu, 24 Mar 2016, Andreas Schneider wrote:
> On Wednesday 23 March 2016 21:55:29 Uri Simchoni wrote:
> > On 03/23/2016 09:36 AM, Andreas Schneider wrote:
> > > I forgot that I already fixed it. Here is the correct patch.
> > > 
> > > 	-- andreas
> > 
> > I pushed it, and it failed autobuild during build:
> > 
> > ../source4/libnet/libnet_export_keytab.c:24:17: fatal error: hdb.h: No
> > such file or directory
> >   #include <hdb.h>
> >                   ^
> > I'm pushing Alexander's previous patch for the time being.
> > 
> > Thanks,
> > Uri.
> 
> Looks like I set the wrong one, sorry.
> 
> Here is a followup patch.
> 
> We removed the hdb dependency from this code so that it works with MIT 
> Kerberos too, so we need to link against db-glue and not HDB_SAMBA4!
> 
> 
> 	-- andreas
> 
> -- 
> Andreas Schneider                   GPG-ID: CC014E3D
> Samba Team                             asn at samba.org
> www.samba.org

> From 2edb3c7cc2fc9f802598b49fda954c99241a6e7c Mon Sep 17 00:00:00 2001
> From: Andreas Schneider <asn at samba.org>
> Date: Thu, 10 Mar 2016 14:30:38 +0100
> Subject: [PATCH] s4-libnet: Link dckeytab.so correctly when is AD DC enabled
> 
> Signed-off-by: Andreas Schneider <asn at samba.org>
> ---
>  source4/libnet/libnet_export_keytab.c | 1 -
>  source4/libnet/wscript_build          | 4 ++--
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/source4/libnet/libnet_export_keytab.c b/source4/libnet/libnet_export_keytab.c
> index bdd77c0..ee2c470 100644
> --- a/source4/libnet/libnet_export_keytab.c
> +++ b/source4/libnet/libnet_export_keytab.c
> @@ -21,7 +21,6 @@
>  #include "includes.h"
>  #include "system/kerberos.h"
>  #include "auth/kerberos/kerberos.h"
> -#include <hdb.h>
>  #include "kdc/samba_kdc.h"
>  #include "libnet/libnet_export_keytab.h"
>  
> diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
> index daae59f..1274a82 100644
> --- a/source4/libnet/wscript_build
> +++ b/source4/libnet/wscript_build
> @@ -16,7 +16,7 @@ bld.SAMBA_PYTHON('python_net',
>  
>  bld.SAMBA_PYTHON('python_dckeytab',
>  	source='py_net_dckeytab.c libnet_export_keytab.c',
> -	deps='pyrpc_util HDB_SAMBA4 com_err',
> +	deps='pyrpc_util db-glue krb5 com_err',
>  	realname='samba/dckeytab.so',
> -        enabled=bld.CONFIG_SET('SAMBA4_USES_HEIMDAL') and bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED')
> +        enabled=bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED')
>  	)
> -- 
> 2.7.4
> 
RB+

-- 
/ Alexander Bokovoy