[PATCH] don't build AD DC-specific dns and dsdb modules without AD DC
Alexander Bokovoy
ab at samba.org
Fri Jul 20 10:01:49 UTC 2018
Hi,
small patchset to make sure we don't build packages which couldn't be
used without AD DC when no AD DC is compiled in.
--
/ Alexander Bokovoy
-------------- next part --------------
>From 8d59d7f3d6d2d8cbf7b22b91b5d3a356e4de6713 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab at samba.org>
Date: Fri, 20 Jul 2018 12:31:20 +0300
Subject: [PATCH 1/2] s4-dns_server: Only build dns server Python code for AD
DC
Signed-off-by: Alexander Bokovoy <ab at samba.org>
---
source4/dns_server/wscript_build | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build
index c24f45584a4..c01e618b561 100644
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -71,6 +71,8 @@ for env in bld.gen_python_environments():
pytalloc_util = bld.pyembed_libname('pytalloc-util')
bld.SAMBA_PYTHON('python_dsdb_dns',
- source='pydns.c',
- deps='samdb %s %s dnsserver_common %s' % (pyldb_util, pyrpc_util, pytalloc_util),
- realname='samba/dsdb_dns.so')
+ source='pydns.c',
+ deps='samdb %s %s dnsserver_common %s' % (
+ pyldb_util, pyrpc_util, pytalloc_util),
+ realname='samba/dsdb_dns.so',
+ enabled=bld.AD_DC_BUILD_IS_ENABLED())
--
2.17.1
>From 4702a9b995e3ad7b126d1fc7a1474a8a471f7a78 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab at samba.org>
Date: Fri, 20 Jul 2018 12:32:20 +0300
Subject: [PATCH 2/2] s4-dsdb: only build dsdb Python modules for AD DC
Signed-off-by: Alexander Bokovoy <ab at samba.org>
---
source4/dsdb/wscript_build | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index be99e9950ef..34ba8edb44a 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -40,12 +40,14 @@ bld.SAMBA_MODULE('service_drepl',
bld.SAMBA_LIBRARY('dsdb_garbage_collect_tombstones',
source='kcc/garbage_collect_tombstones.c',
deps='samdb RPC_NDR_DRSUAPI',
- private_library=True)
+ private_library=True,
+ enabled=bld.AD_DC_BUILD_IS_ENABLED())
bld.SAMBA_LIBRARY('scavenge_dns_records',
source='kcc/scavenge_dns_records.c',
deps='samdb RPC_NDR_DRSUAPI dnsserver_common',
- private_library=True)
+ private_library=True,
+ enabled=bld.AD_DC_BUILD_IS_ENABLED())
bld.SAMBA_MODULE('service_kcc',
source='kcc/kcc_service.c kcc/kcc_connection.c kcc/kcc_periodic.c kcc/kcc_drs_replica_info.c',
@@ -78,5 +80,6 @@ for env in bld.gen_python_environments():
# removes it so we end up with unresolved symbols.
deps='samdb %s dcerpc com_err %s %s dsdb_garbage_collect_tombstones scavenge_dns_records' %\
(pyldb_util, pyrpc_util, pyparam_util),
- realname='samba/dsdb.so'
- )
+ realname='samba/dsdb.so',
+ enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ )
--
2.17.1
More information about the samba-technical
mailing list