Revert "waf-mitkrb5: enable dcerpc_server library to support OpenChange client code"

This reverts commit f8c447b1a48eaf12dcf70b92fd7525c4ad26c246.

After discussing with Julien (Openchange) and Metze, I decided to revert this code.
Instead I made a patch to Openchange which allows to build client side only.

Openchange server code requires working s4 member DC and --without-ad-dc build
does not provide working provisioning even if we enable dcerpc_server and end point mapper.

Autobuild-User: Alexander Bokovoy <ab@samba.org>
Autobuild-Date: Fri Jun  1 16:46:08 CEST 2012 on sn-devel-104

3 files changed, 23 insertions, 41 deletions

diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 84df78bac6..e3a863af49 100755
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -11,26 +11,25 @@ bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
 	source='common/forward.c common/reply.c dcesrv_auth.c common/loadparm.c',
 	autoproto='common/proto.h',
 	deps='ldb DCERPC_SHARE samba_server_gensec',
-	enabled=True
+	enabled=bld.AD_DC_BUILD_IS_ENABLED()
 	)
 
 bld.SAMBA_LIBRARY('dcerpc_server',
 	source='dcerpc_server.c dcesrv_mgmt.c handles.c',
 	pc_files='dcerpc_server.pc',
-	deps='LIBCLI_AUTH DCERPC_COMMON ndr samba_server_gensec dcerpc_remote service',
+	deps='LIBCLI_AUTH ndr samba_server_gensec dcerpc_remote service',
 	public_deps='dcerpc',
 	autoproto='dcerpc_server_proto.h',
 	public_headers='dcerpc_server.h',
 	vnum='0.0.1',
-	enabled=True
+	enabled=bld.AD_DC_BUILD_IS_ENABLED()
 	)
 
 bld.SAMBA_MODULE('dcerpc_rpcecho',
 	source='echo/rpc_echo.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_rpcecho_init',
-	deps='ndr-standard events',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='ndr-standard events'
 	)
 
 
@@ -38,8 +37,7 @@ bld.SAMBA_MODULE('dcerpc_epmapper',
 	source='epmapper/rpc_epmapper.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_epmapper_init',
-	deps='NDR_EPMAPPER',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='NDR_EPMAPPER'
 	)
 
 
@@ -47,8 +45,7 @@ bld.SAMBA_MODULE('dcerpc_remote',
 	source='remote/dcesrv_remote.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_remote_init',
-	deps='LIBCLI_SMB ndr-table',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='LIBCLI_SMB ndr-table'
 	)
 
 
@@ -57,8 +54,7 @@ bld.SAMBA_MODULE('dcerpc_srvsvc',
 	autoproto='srvsvc/proto.h',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_srvsvc_init',
-	deps='DCERPC_COMMON NDR_SRVSVC share ntvfs',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='DCERPC_COMMON NDR_SRVSVC share ntvfs'
 	)
 
 
@@ -66,8 +62,7 @@ bld.SAMBA_MODULE('dcerpc_wkssvc',
 	source='wkssvc/dcesrv_wkssvc.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_wkssvc_init',
-	deps='DCERPC_COMMON ndr-standard',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='DCERPC_COMMON ndr-standard'
 	)
 
 
@@ -75,8 +70,7 @@ bld.SAMBA_MODULE('dcerpc_unixinfo',
 	source='unixinfo/dcesrv_unixinfo.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_unixinfo_init',
-	deps='DCERPC_COMMON samdb NDR_UNIXINFO LIBWBCLIENT_OLD',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='DCERPC_COMMON samdb NDR_UNIXINFO LIBWBCLIENT_OLD'
 	)
 
 
@@ -85,8 +79,7 @@ bld.SAMBA_MODULE('dcesrv_samr',
 	autoproto='samr/proto.h',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_samr_init',
-	deps='samdb DCERPC_COMMON ndr-standard',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='samdb DCERPC_COMMON ndr-standard'
 	)
 
 
@@ -95,8 +88,7 @@ bld.SAMBA_MODULE('dcerpc_winreg',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_winreg_init',
 	deps='registry ndr-standard',
-	internal_module=True,
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	internal_module=True
 	)
 
 
@@ -104,8 +96,7 @@ bld.SAMBA_MODULE('dcerpc_netlogon',
 	source='netlogon/dcerpc_netlogon.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_netlogon_init',
-	deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNEL ndr-standard auth4_sam samba-hostconfig CLDAPD',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNEL ndr-standard auth4_sam samba-hostconfig CLDAPD'
 	)
 
 
@@ -114,8 +105,7 @@ bld.SAMBA_MODULE('dcerpc_lsarpc',
 	autoproto='lsa/proto.h',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_lsa_init',
-	deps='samdb DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err security UTIL_LSARPC',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='samdb DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err security UTIL_LSARPC'
 	)
 
 
@@ -124,8 +114,7 @@ bld.SAMBA_MODULE('dcerpc_backupkey',
 	autoproto='backupkey/proto.h',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_backupkey_init',
-	deps='samdb DCERPC_COMMON NDR_BACKUPKEY RPC_NDR_BACKUPKEY krb5 hx509 hcrypto',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='samdb DCERPC_COMMON NDR_BACKUPKEY RPC_NDR_BACKUPKEY krb5 hx509 hcrypto'
 	)
 
 
@@ -134,8 +123,7 @@ bld.SAMBA_MODULE('dcerpc_spoolss',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_spoolss_init',
 	deps='DCERPC_COMMON NDR_SPOOLSS ntptr RPC_NDR_SPOOLSS',
-	internal_module=True,
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	internal_module=True
 	)
 
 
@@ -143,8 +131,7 @@ bld.SAMBA_MODULE('dcerpc_drsuapi',
 	source='drsuapi/dcesrv_drsuapi.c drsuapi/updaterefs.c drsuapi/getncchanges.c drsuapi/addentry.c drsuapi/writespn.c drsuapi/drsutil.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_drsuapi_init',
-	deps='samdb DCERPC_COMMON NDR_DRSUAPI security',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='samdb DCERPC_COMMON NDR_DRSUAPI security'
 	)
 
 
@@ -152,24 +139,21 @@ bld.SAMBA_MODULE('dcerpc_browser',
 	source='browser/dcesrv_browser.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_browser_init',
-	deps='DCERPC_COMMON NDR_BROWSER',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='DCERPC_COMMON NDR_BROWSER'
 	)
 
 bld.SAMBA_MODULE('dcerpc_eventlog',
 	source='eventlog/dcesrv_eventlog6.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_eventlog6_init',
-	deps='DCERPC_COMMON',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='DCERPC_COMMON'
 	)
 
 bld.SAMBA_MODULE('dcerpc_dnsserver',
     source='dnsserver/dcerpc_dnsserver.c dnsserver/dnsutils.c dnsserver/dnsdata.c dnsserver/dnsdb.c',
     subsystem='dcerpc_server',
     init_function='dcerpc_server_dnsserver_init',
-    deps='DCERPC_COMMON',
-    enabled=bld.AD_DC_BUILD_IS_ENABLED()
+    deps='DCERPC_COMMON'
     )
 
 
@@ -179,7 +163,6 @@ bld.SAMBA_MODULE('service_dcerpc',
 	subsystem='service',
 	init_function='server_service_rpc_init',
 	internal_module=False,
-	deps='dcerpc_server',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='dcerpc_server'
 	)
 
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index f86cd5199b..97877fc54b 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('service',
 	autoproto='service_proto.h',
 	deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH npa_tstream gssapi samba-credentials LIBTSOCKET LIBSAMBA_TSOCKET process_model',
 	private_library=True,
-	enabled=True
+	enabled=bld.AD_DC_BUILD_IS_ENABLED()
 	)
 
 
@@ -20,7 +20,7 @@ bld.SAMBA_LIBRARY('process_model',
                   autoproto='process_model_proto.h',
                   deps='samba-util samba-hostconfig samba-modules',
                   private_library=True,
-                  enabled=True
+                  enabled=bld.AD_DC_BUILD_IS_ENABLED()
                   )
 
 bld.SAMBA_BINARY('samba',
diff --git a/source4/wrepl_server/wscript_build b/source4/wrepl_server/wscript_build
index 434c8d7f79..79b1a8cab1 100644
--- a/source4/wrepl_server/wscript_build
+++ b/source4/wrepl_server/wscript_build
@@ -6,7 +6,6 @@ bld.SAMBA_MODULE('service_wrepl',
 	subsystem='service',
 	init_function='server_service_wrepl_init',
 	internal_module=False,
-	deps='LIBCLI_WREPL WINSDB process_model RPC_NDR_IRPC',
-	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+	deps='LIBCLI_WREPL WINSDB process_model RPC_NDR_IRPC'
 	)