WIP: waf: wrap modules specific to Heimdal use into SAMBA4_USES_HEIMDAL build
authorAlexander Bokovoy <ab@samba.org>
Wed, 25 Apr 2012 14:00:33 +0000 (17:00 +0300)
committerSimo Sorce <idra@samba.org>
Thu, 26 Apr 2012 23:05:52 +0000 (19:05 -0400)
These modules depend on Heimdal-based code for Samba4 AD DC build
thus they cannot be used for MIT krb5 build.

source4/auth/gensec/wscript_build
source4/dsdb/samdb/ldb_modules/wscript_build
source4/libnet/wscript_build
source4/rpc_server/wscript_build

index dd25b23fdb2e4d64bd5f6ee523cc023ee6c9b7d5..1c0ba748cc229779ceac333e4adad4c3008b861a 100644 (file)
@@ -5,20 +5,21 @@ bld.SAMBA_SUBSYSTEM('gensec_util',
                     deps='tevent-util tevent samba-util LIBTSOCKET',
                     autoproto='gensec_proto.h')
 
-bld.SAMBA_MODULE('gensec_krb5',
-       source='gensec_krb5.c',
-       subsystem='gensec',
-       init_function='gensec_krb5_init',
-       deps='samba-credentials authkrb5 com_err gensec_util',
-       internal_module=False,
+if bld.CONFIG_SET('SAMBA4_USES_HEIMDAL'):
+       bld.SAMBA_MODULE('gensec_krb5',
+               source='gensec_krb5.c',
+               subsystem='gensec',
+               init_function='gensec_krb5_init',
+               deps='samba-credentials authkrb5 com_err gensec_util',
+               internal_module=False,
        )
 
 
-bld.SAMBA_MODULE('gensec_gssapi',
-       source='gensec_gssapi.c',
-       subsystem='gensec',
-       init_function='gensec_gssapi_init',
-       deps='gssapi samba-credentials authkrb5 com_err gensec_util'
+       bld.SAMBA_MODULE('gensec_gssapi',
+               source='gensec_gssapi.c',
+               subsystem='gensec',
+               init_function='gensec_gssapi_init',
+               deps='gssapi samba-credentials authkrb5 com_err gensec_util'
        )
 
 
index ab9ba13097d1d8758a0fefbfdc3b7516998ab159..2ab0cf65295d8f8ac88d9c064c22ab48b7b45b8f 100755 (executable)
@@ -127,14 +127,14 @@ bld.SAMBA_MODULE('ldb_rootdse',
        deps='talloc samdb MESSAGING security DSDB_MODULE_HELPERS'
        )
 
-
-bld.SAMBA_MODULE('ldb_password_hash',
-       source='password_hash.c',
-       subsystem='ldb',
-       init_function='ldb_password_hash_module_init',
-       module_init_name='ldb_init_module',
-       internal_module=False,
-       deps='talloc samdb LIBCLI_AUTH NDR_DRSBLOBS authkrb5 krb5 DSDB_MODULE_HELPERS'
+if bld.CONFIG_GET('SAMBA4_USES_HEIMDAL'):
+       bld.SAMBA_MODULE('ldb_password_hash',
+               source='password_hash.c',
+               subsystem='ldb',
+               init_function='ldb_password_hash_module_init',
+               module_init_name='ldb_init_module',
+               internal_module=False,
+               deps='talloc samdb LIBCLI_AUTH NDR_DRSBLOBS authkrb5 krb5 DSDB_MODULE_HELPERS'
        )
 
 
@@ -208,13 +208,14 @@ bld.SAMBA_MODULE('ldb_new_partition',
        )
 
 
-bld.SAMBA_MODULE('ldb_update_keytab',
-       source='update_keytab.c',
-       subsystem='ldb',
-       init_function='ldb_update_keytab_module_init',
-       module_init_name='ldb_init_module',
-       internal_module=False,
-       deps='talloc samba-credentials ldb com_err KERBEROS_SRV_KEYTAB SECRETS DSDB_MODULE_HELPERS'
+if bld.CONFIG_GET('SAMBA4_USES_HEIMDAL'):
+       bld.SAMBA_MODULE('ldb_update_keytab',
+               source='update_keytab.c',
+               subsystem='ldb',
+               init_function='ldb_update_keytab_module_init',
+               module_init_name='ldb_init_module',
+               internal_module=False,
+               deps='talloc samba-credentials ldb com_err KERBEROS_SRV_KEYTAB SECRETS DSDB_MODULE_HELPERS'
        )
 
 
@@ -328,13 +329,14 @@ bld.SAMBA_MODULE('ldb_resolve_oids',
        )
 
 
-bld.SAMBA_MODULE('ldb_acl',
-       source='acl.c',
-       subsystem='ldb',
-       init_function='ldb_acl_module_init',
-       module_init_name='ldb_init_module',
-       internal_module=False,
-       deps='talloc security samdb DSDB_MODULE_HELPERS'
+if bld.CONFIG_GET('SAMBA4_USES_HEIMDAL'):
+       bld.SAMBA_MODULE('ldb_acl',
+               source='acl.c',
+               subsystem='ldb',
+               init_function='ldb_acl_module_init',
+               module_init_name='ldb_init_module',
+               internal_module=False,
+               deps='talloc security samdb DSDB_MODULE_HELPERS'
        )
 
 
index 57e3160c8b2d93ff3d906333f58edeb3a8182c99..071edd0da0561734b9cfd9dfcef064f594bd678d 100644 (file)
@@ -14,8 +14,9 @@ bld.SAMBA_PYTHON('python_net',
        realname='samba/net.so'
        )
 
-bld.SAMBA_PYTHON('python_dckeytab',
-       source='py_net_dckeytab.c libnet_export_keytab.c',
-       deps='pyrpc_util HDB_SAMBA4 com_err',
-       realname='samba/dckeytab.so'
-       )
+if bld.CONFIG_SET("SAMBA4_USES_HEIMDAL"):
+       bld.SAMBA_PYTHON('python_dckeytab',
+               source='py_net_dckeytab.c libnet_export_keytab.c',
+               deps='pyrpc_util HDB_SAMBA4 com_err',
+               realname='samba/dckeytab.so'
+               )
index c684c05ca85aeeeb3d84967c96d70892759f1b4a..4c00cd8fbe5b97ddc1fca4537841918d897da77a 100755 (executable)
@@ -97,13 +97,14 @@ bld.SAMBA_MODULE('dcerpc_lsarpc',
        )
 
 
-bld.SAMBA_MODULE('dcerpc_backupkey',
-       source='backupkey/dcesrv_backupkey.c ',
-       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'
-       )
+if bld.CONFIG_SET("SAMBA4_USES_HEIMDAL"):
+       bld.SAMBA_MODULE('dcerpc_backupkey',
+               source='backupkey/dcesrv_backupkey.c ',
+               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'
+               )
 
 
 bld.SAMBA_MODULE('dcerpc_spoolss',