From 2ddf89a2bc3c00b71dec230f071416e594f89113 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 21 May 2012 12:45:12 +0300 Subject: Introduce system MIT krb5 build with --with-system-mitkrb5 option. System MIT krb5 build also enabled by specifying --without-ad-dc When --with-system-mitkrb5 (or --withou-ad-dc) option is passed to top level configure in WAF build we are trying to detect and use system-wide MIT krb5 libraries. As result, Samba 4 DC functionality will be disabled due to the fact that it is currently impossible to implement embedded KDC server with MIT krb5. Thus, --with-system-mitkrb5/--without-ad-dc build will only produce * Samba 4 client libraries and their Python bindings * Samba 3 server (smbd, nmbd, winbindd from source3/) * Samba 3 client libraries In addition, Samba 4 DC server-specific tests will not be compiled into smbtorture. This in particular affects spoolss_win, spoolss_notify, and remote_pac rpc tests. --- source4/smbd/wscript_build | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'source4/smbd') diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index ab92e3c920..97877fc54b 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -4,7 +4,8 @@ bld.SAMBA_LIBRARY('service', source='service.c service_stream.c service_named_pipe.c service_task.c', 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 + private_library=True, + enabled=bld.AD_DC_BUILD_IS_ENABLED() ) @@ -14,6 +15,13 @@ bld.SAMBA_SUBSYSTEM('PIDFILE', autoproto='pidfile.h' ) +bld.SAMBA_LIBRARY('process_model', + source='process_model.c', + autoproto='process_model_proto.h', + deps='samba-util samba-hostconfig samba-modules', + private_library=True, + enabled=bld.AD_DC_BUILD_IS_ENABLED() + ) bld.SAMBA_BINARY('samba', source='server.c', @@ -22,12 +30,10 @@ bld.SAMBA_BINARY('samba', deps='''events process_model service samba-hostconfig samba-util POPT_SAMBA PIDFILE popt gensec registry ntptr ntvfs share cluster COMMON_SCHANNEL SECRETS''', pyembed=True, - install_path='${SBINDIR}' + install_path='${SBINDIR}', + enabled=bld.AD_DC_BUILD_IS_ENABLED() ) - - - bld.SAMBA_MODULE('process_model_single', source='process_single.c', subsystem='process_model', @@ -73,10 +79,3 @@ bld.SAMBA_MODULE('process_model_onefork', ) -bld.SAMBA_LIBRARY('process_model', - source='process_model.c', - autoproto='process_model_proto.h', - deps='samba-util samba-hostconfig samba-modules', - private_library=True - ) - -- cgit