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

[Alexander Bokovoy]

On Wed, 23 Mar 2016, Andreas Schneider wrote:
> On Wednesday 23 March 2016 09:17:47 Uri Simchoni wrote:
> > On 03/23/2016 09:15 AM, Andreas Schneider wrote:
> > > On Wednesday 23 March 2016 08:17:09 Alexander Bokovoy wrote:
> > >> On Wed, 23 Mar 2016, Uri Simchoni wrote:
> > >>> When building master --without-ad-dc and bundled heimdal, I get the
> > >>> following error when the build begins:
> > >>> 
> > >>> Checking project rules ...
> > >>> Unknown dependency 'HDB_SAMBA4' in 'python_dckeytab.objlist'
> > >>> 
> > >>> To reproduce (FC23 but probably others too):
> > >>> ./configure --without-ad-dc
> > >>> make
> > >>> 
> > >>> No problems with 4.4.0.
> > >>> 
> > >>> The immediate suspect would be mit-kdb addition, commit
> > >>> ade958e20b561b702e2fec86a28659144dbe4a9e, but I can't see the link. I'm
> > >>> bisecting to find the commit, but if someone more familiar with this
> > >>> area
> > >>> of the code can do an "Aha!" and save me the work I'd be grateful.
> > >> 
> > >> Attached should fix the problem.
> > > 
> > > Great catch Uri!
> > > 
> > > But I think the attached patch is the correct one. The code doesn't use
> > > HDB
> > > anymore!
> > > 
> > > 
> > > 
> > > Cheers,
> > > 
> > > 	-- andreas
> > 
> > I'll stop autobuild and push this one then. I was just about to send a
> > similar thing for review...
> 
> I forgot that I already fixed it. Here is the correct patch.
> 
> 
> 	-- andreas
> 
> -- 
> Andreas Schneider                   GPG-ID: CC014E3D
> Samba Team                             asn at samba.org
> www.samba.org

> From 8f890e28ccd86a08eb3879298c27fe425c790551 Mon Sep 17 00:00:00 2001
> From: Andreas Schneider <asn at samba.org>
> Date: Wed, 23 Mar 2016 08:14:22 +0100
> Subject: [PATCH] s4-libnet: Only build python-dckeytab module if AD DC is
>  enabled
> 
> Signed-off-by: Andreas Schneider <asn at samba.org>
> ---
>  source4/libnet/wscript_build | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
> index 6cca50d..216ac14 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 com_err',
>  	realname='samba/dckeytab.so',
> -        enabled=bld.CONFIG_SET('SAMBA4_USES_HEIMDAL')
> +        enabled=bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED')
>  	)
> -- 
> 2.7.4
> 

RB+, please push.
-- 
/ Alexander Bokovoy