The branch, master has been updated
via c027e3d s4-libnet: Link dckeytab.so correctly when is AD DC enabled
from 725bef6 s4:torture:smb2:rename.c: Fix file permissions.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c027e3d6087df6182746f4e1e08ef0ef801a5ee7
Author: Andreas Schneider <[email protected]>
Date: Thu Mar 10 14:30:38 2016 +0100
s4-libnet: Link dckeytab.so correctly when is AD DC enabled
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Alexander Bokovoy <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Thu Mar 24 15:12:21 CET 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source4/libnet/libnet_export_keytab.c | 1 -
source4/libnet/wscript_build | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
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')
)
--
Samba Shared Repository
