s4-libnet: Link dckeytab.so correctly when is AD DC enabled

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Thu Mar 24 15:12:21 CET 2016 on sn-devel-144

diff --git a/source4/libnet/libnet_export_keytab.c b/source4/libnet/libnet_export_keytab.c
index bdd77c0d1c6c56140975f136ec29dd846863d392..ee2c47083c0edb4b078517bac1c545b1d98f9634 100644 (file)
--- 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 "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"
 
 #include "kdc/samba_kdc.h"
 #include "libnet/libnet_export_keytab.h"
 

diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build
index daae59fa5a7c774bcfce0e724ec56b3178b0a62d..1274a82d04c5e7ac723aec42de185689f5204673 100644 (file)
--- 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',
 
 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',
        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')

        )
        )