From 0878399bd57db88aa49ac2a0a139c269feda9137 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 7 Nov 2010 01:52:13 +0100 Subject: samdb: Lowercase library name. --- source4/auth/ntlm/wscript_build | 4 +- source4/auth/wscript_build | 6 +- source4/dsdb/samdb/ldb_modules/wscript_build | 150 +++++++++++++-------------- source4/dsdb/wscript_build | 32 +++--- source4/ldap_server/wscript_build | 2 +- source4/ntp_signd/wscript_build | 2 +- source4/ntvfs/posix/wscript_build | 4 +- source4/ntvfs/unixuid/wscript_build | 2 +- source4/rpc_server/wscript_build | 8 +- source4/torture/drs/wscript_build | 2 +- source4/torture/local/wscript_build | 2 +- source4/torture/wscript_build | 2 +- source4/utils/wscript_build | 2 +- 13 files changed, 109 insertions(+), 109 deletions(-) diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build index a4d18161b3..4538ba4a3a 100644 --- a/source4/auth/ntlm/wscript_build +++ b/source4/auth/ntlm/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_MODULE('auth_sam_module', source='auth_sam.c', subsystem='auth', init_function='auth_sam_init', - deps='SAMDB auth_sam ntlm_check samba-hostconfig' + deps='samdb auth_sam ntlm_check samba-hostconfig' ) @@ -57,7 +57,7 @@ bld.SAMBA_SUBSYSTEM('PAM_ERRORS', bld.SAMBA_LIBRARY('auth', source='auth.c auth_util.c auth_simple.c', autoproto='auth_proto.h', - deps='samba-util security SAMDB CREDENTIALS UTIL_TEVENT', + deps='samba-util security samdb CREDENTIALS UTIL_TEVENT', private_library=True ) diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build index 2ef3c0daed..178d67a14c 100644 --- a/source4/auth/wscript_build +++ b/source4/auth/wscript_build @@ -12,7 +12,7 @@ bld.SAMBA_SUBSYSTEM('auth_session', public_deps='CREDENTIALS', public_headers='session.h', header_path='samba', - deps='SAMDB auth_sam' + deps='samdb auth_sam' ) @@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('auth_system_session', bld.SAMBA_SUBSYSTEM('auth_sam', source='sam.c', autoproto='auth_sam.h', - public_deps='SAMDB security ldb tevent', + public_deps='samdb security ldb tevent', deps='' ) @@ -48,7 +48,7 @@ bld.SAMBA_SUBSYSTEM('auth_sam_reply', bld.SAMBA_PYTHON('pyauth', source='pyauth.c', public_deps='auth_system_session', - deps='SAMDB pytalloc-util pyparam_util', + deps='samdb pytalloc-util pyparam_util', realname='samba/auth.so' ) diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index 1232465fbd..5963f8551f 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -28,8 +28,8 @@ bld.SAMBA_MODULE('ldb_samba_dsdb', source='samba_dsdb.c', subsystem='ldb', init_function='ldb_samba_dsdb_module_init', - module_init_name='ldb_init_module', - deps='SAMDB talloc events ndr DSDB_MODULE_HELPERS', + module_init_name='ldb_init_module', + deps='samdb talloc events ndr DSDB_MODULE_HELPERS', internal_module=False, ) @@ -38,9 +38,9 @@ bld.SAMBA_MODULE('ldb_samba_secrets', source='samba_secrets.c', subsystem='ldb', init_function='ldb_samba_secrets_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='SAMDB talloc events ndr' + deps='samdb talloc events ndr' ) @@ -48,9 +48,9 @@ bld.SAMBA_MODULE('ldb_objectguid', source='objectguid.c', subsystem='ldb', init_function='ldb_objectguid_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='SAMDB talloc events ndr' + deps='samdb talloc events ndr' ) @@ -58,9 +58,9 @@ bld.SAMBA_MODULE('ldb_repl_meta_data', source='repl_meta_data.c', subsystem='ldb', init_function='ldb_repl_meta_data_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='SAMDB talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security-session' + deps='samdb talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security-session' ) @@ -68,9 +68,9 @@ bld.SAMBA_MODULE('ldb_schema_load', source='schema_load.c', subsystem='ldb', init_function='ldb_schema_load_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='SAMDB talloc events DSDB_MODULE_HELPERS' + deps='samdb talloc events DSDB_MODULE_HELPERS' ) @@ -78,9 +78,9 @@ bld.SAMBA_MODULE('ldb_schema_data', source='schema_data.c', subsystem='ldb', init_function='ldb_schema_data_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='SAMDB talloc events DSDB_MODULE_HELPERS' + deps='samdb talloc events DSDB_MODULE_HELPERS' ) @@ -88,9 +88,9 @@ bld.SAMBA_MODULE('ldb_naming_fsmo', source='naming_fsmo.c', subsystem='ldb', init_function='ldb_naming_fsmo_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='SAMDB talloc events DSDB_MODULE_HELPERS' + deps='samdb talloc events DSDB_MODULE_HELPERS' ) @@ -98,9 +98,9 @@ bld.SAMBA_MODULE('ldb_pdc_fsmo', source='pdc_fsmo.c', subsystem='ldb', init_function='ldb_pdc_fsmo_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='SAMDB talloc events DSDB_MODULE_HELPERS' + deps='samdb talloc events DSDB_MODULE_HELPERS' ) @@ -108,9 +108,9 @@ bld.SAMBA_MODULE('ldb_samldb', source='samldb.c', subsystem='ldb', init_function='ldb_samldb_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC' + deps='talloc events samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC' ) @@ -118,7 +118,7 @@ bld.SAMBA_MODULE('ldb_samba3sam', source='samba3sam.c', subsystem='ldb', init_function='ldb_samba3sam_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, deps='talloc events ldb smbpasswd security NDR_SECURITY' ) @@ -128,29 +128,29 @@ bld.SAMBA_MODULE('ldb_samba3sid', source='samba3sid.c', subsystem='ldb', init_function='ldb_samba3sid_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, deps='talloc events ldb security NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS' ) bld.SAMBA_MODULE('ldb_simple_ldap_map', - source='simple_ldap_map.c', - subsystem='ldb', - init_function='ldb_simple_ldap_map_module_init', - module_init_name='ldb_init_module', - internal_module=False, - deps='talloc events ldb ndr LDBSAMBA' - ) + source='simple_ldap_map.c', + subsystem='ldb', + init_function='ldb_simple_ldap_map_module_init', + module_init_name='ldb_init_module', + internal_module=False, + deps='talloc events ldb ndr LDBSAMBA' + ) bld.SAMBA_MODULE('ldb_rootdse', source='rootdse.c', subsystem='ldb', init_function='ldb_rootdse_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events SAMDB MESSAGING security-session DSDB_MODULE_HELPERS' + deps='talloc events samdb MESSAGING security-session DSDB_MODULE_HELPERS' ) @@ -158,9 +158,9 @@ 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', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events SAMDB LIBCLI_AUTH NDR_DRSBLOBS authkrb5 hdb krb5 com_err' + deps='talloc events samdb LIBCLI_AUTH NDR_DRSBLOBS authkrb5 hdb krb5 com_err' ) @@ -168,38 +168,38 @@ bld.SAMBA_MODULE('ldb_local_password', source='local_password.c', subsystem='ldb', init_function='ldb_local_password_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events ndr SAMDB' + deps='talloc events ndr samdb' ) bld.SAMBA_MODULE('ldb_extended_dn_in', source='extended_dn_in.c', subsystem='ldb', init_function='ldb_extended_dn_in_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, deps='talloc events samba-util' ) bld.SAMBA_MODULE('ldb_extended_dn_out', - source='extended_dn_out.c', - init_function='ldb_extended_dn_out_module_init', - module_init_name='ldb_init_module', - subsystem='ldb', - deps='talloc events ndr samba-util SAMDB', - internal_module=False, - ) + source='extended_dn_out.c', + init_function='ldb_extended_dn_out_module_init', + module_init_name='ldb_init_module', + subsystem='ldb', + deps='talloc events ndr samba-util samdb', + internal_module=False, + ) bld.SAMBA_MODULE('ldb_extended_dn_store', source='extended_dn_store.c', subsystem='ldb', init_function='ldb_extended_dn_store_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events samba-util SAMDB DSDB_MODULE_HELPERS' + deps='talloc events samba-util samdb DSDB_MODULE_HELPERS' ) @@ -207,7 +207,7 @@ bld.SAMBA_MODULE('ldb_show_deleted', source='show_deleted.c', subsystem='ldb', init_function='ldb_show_deleted_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, deps='talloc events samba-util DSDB_MODULE_HELPERS' ) @@ -218,9 +218,9 @@ bld.SAMBA_MODULE('ldb_partition', autoproto='partition_proto.h', subsystem='ldb', init_function='ldb_partition_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events SAMDB DSDB_MODULE_HELPERS' + deps='talloc events samdb DSDB_MODULE_HELPERS' ) @@ -228,9 +228,9 @@ bld.SAMBA_MODULE('ldb_new_partition', source='new_partition.c', subsystem='ldb', init_function='ldb_new_partition_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events SAMDB DSDB_MODULE_HELPERS' + deps='talloc events samdb DSDB_MODULE_HELPERS' ) @@ -238,7 +238,7 @@ 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', + module_init_name='ldb_init_module', internal_module=False, deps='talloc events CREDENTIALS ldb com_err KERBEROS_UTIL' ) @@ -248,9 +248,9 @@ bld.SAMBA_MODULE('ldb_objectclass', source='objectclass.c', subsystem='ldb', init_function='ldb_objectclass_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS samba-util DSDB_MODULE_HELPER_SCHEMA' + deps='talloc events security NDR_SECURITY samdb DSDB_MODULE_HELPERS samba-util DSDB_MODULE_HELPER_SCHEMA' ) @@ -258,8 +258,8 @@ bld.SAMBA_MODULE('ldb_objectclass_attrs', source='objectclass_attrs.c', subsystem='ldb', init_function='ldb_objectclass_attrs_module_init', - module_init_name='ldb_init_module', - deps='talloc SAMDB samba-util', + module_init_name='ldb_init_module', + deps='talloc samdb samba-util', internal_module=False, ) @@ -268,7 +268,7 @@ bld.SAMBA_MODULE('ldb_subtree_rename', source='subtree_rename.c', subsystem='ldb', init_function='ldb_subtree_rename_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, deps='talloc events samba-util ldb samdb-common' ) @@ -278,7 +278,7 @@ bld.SAMBA_MODULE('ldb_subtree_delete', source='subtree_delete.c', subsystem='ldb', init_function='ldb_subtree_delete_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, deps='talloc events samba-util DSDB_MODULE_HELPERS' ) @@ -288,9 +288,9 @@ bld.SAMBA_MODULE('ldb_linked_attributes', source='linked_attributes.c', subsystem='ldb', init_function='ldb_linked_attributes_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events SAMDB DSDB_MODULE_HELPERS' + deps='talloc events samdb DSDB_MODULE_HELPERS' ) @@ -298,7 +298,7 @@ bld.SAMBA_MODULE('ldb_ranged_results', source='ranged_results.c', subsystem='ldb', init_function='ldb_ranged_results_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, deps='talloc events samba-util ldb' ) @@ -308,9 +308,9 @@ bld.SAMBA_MODULE('ldb_anr', source='anr.c', subsystem='ldb', init_function='ldb_anr_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events samba-util SAMDB' + deps='talloc events samba-util samdb' ) @@ -318,9 +318,9 @@ bld.SAMBA_MODULE('ldb_instancetype', source='instancetype.c', subsystem='ldb', init_function='ldb_instancetype_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events samba-util SAMDB DSDB_MODULE_HELPERS' + deps='talloc events samba-util samdb DSDB_MODULE_HELPERS' ) @@ -328,9 +328,9 @@ bld.SAMBA_MODULE('ldb_operational', source='operational.c', subsystem='ldb', init_function='ldb_operational_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc tevent samba-util samdb-common DSDB_MODULE_HELPERS auth SAMDB' + deps='talloc tevent samba-util samdb-common DSDB_MODULE_HELPERS auth samdb' ) @@ -338,9 +338,9 @@ bld.SAMBA_MODULE('ldb_descriptor', source='descriptor.c', subsystem='ldb', init_function='ldb_descriptor_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA' + deps='talloc events security NDR_SECURITY samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA' ) @@ -348,9 +348,9 @@ bld.SAMBA_MODULE('ldb_resolve_oids', source='resolve_oids.c', subsystem='ldb', init_function='ldb_resolve_oids_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='SAMDB talloc events ndr' + deps='samdb talloc events ndr' ) @@ -358,9 +358,9 @@ bld.SAMBA_MODULE('ldb_acl', source='acl.c', subsystem='ldb', init_function='ldb_acl_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events security SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA' + deps='talloc events security samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA' ) @@ -368,25 +368,25 @@ bld.SAMBA_MODULE('ldb_lazy_commit', source='lazy_commit.c', subsystem='ldb', internal_module=False, - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', init_function='ldb_lazy_commit_module_init', - deps='SAMDB DSDB_MODULE_HELPERS' + deps='samdb DSDB_MODULE_HELPERS' ) bld.SAMBA_MODULE('ldb_aclread', source='acl_read.c', subsystem='ldb', init_function='ldb_aclread_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, - deps='talloc events security SAMDB DSDB_MODULE_HELPERS', + deps='talloc events security samdb DSDB_MODULE_HELPERS', ) bld.SAMBA_MODULE('ldb_simple_dn', source='simple_dn.c', subsystem='ldb', init_function='ldb_simple_dn_module_init', - module_init_name='ldb_init_module', + module_init_name='ldb_init_module', internal_module=False, deps='talloc DSDB_MODULE_HELPERS' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 1b3e363f9f..84c10de7bd 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -2,7 +2,7 @@ bld.RECURSE('samdb/ldb_modules') -bld.SAMBA_LIBRARY('SAMDB', +bld.SAMBA_LIBRARY('samdb', source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c', autoproto='samdb/samdb_proto.h', private_library=True, @@ -31,7 +31,7 @@ bld.SAMBA_MODULE('DREPL_SRV', autoproto='repl/drepl_service_proto.h', subsystem='service', init_function='server_service_drepl_init', - deps='SAMDB process_model RPC_NDR_DRSUAPI' + deps='samdb process_model RPC_NDR_DRSUAPI' ) @@ -40,23 +40,23 @@ bld.SAMBA_MODULE('KCC_SRV', autoproto='kcc/kcc_service_proto.h', subsystem='service', init_function='server_service_kcc_init', - deps='SAMDB process_model RPC_NDR_IRPC RPC_NDR_DRSUAPI' + deps='samdb process_model RPC_NDR_IRPC RPC_NDR_DRSUAPI' ) bld.SAMBA_MODULE('DNS_UPDATE_SRV', - source='dns/dns_update.c', - subsystem='service', - init_function='server_service_dnsupdate_init', - deps='SAMDB UTIL_RUNCMD samba-util ldb samdb-common errors talloc auth_system_session samba-hostconfig', - internal_module=False - ) + source='dns/dns_update.c', + subsystem='service', + init_function='server_service_dnsupdate_init', + deps='samdb UTIL_RUNCMD samba-util ldb samdb-common errors talloc auth_system_session samba-hostconfig', + internal_module=False + ) bld.SAMBA_PYTHON('python_dsdb', - source='pydsdb.c', - # the dependency on dcerpc here is because gensec - # depends on dcerpc but the waf circular dependency finder - # removes it so we end up with unresolved symbols. - deps='SAMDB pyldb-util dcerpc com_err pyrpc_util', - realname='samba/dsdb.so' - ) + source='pydsdb.c', + # the dependency on dcerpc here is because gensec + # depends on dcerpc but the waf circular dependency finder + # removes it so we end up with unresolved symbols. + deps='samdb pyldb-util dcerpc com_err pyrpc_util', + realname='samba/dsdb.so' + ) diff --git a/source4/ldap_server/wscript_build b/source4/ldap_server/wscript_build index 334d304dd4..75edb17517 100644 --- a/source4/ldap_server/wscript_build +++ b/source4/ldap_server/wscript_build @@ -6,6 +6,6 @@ bld.SAMBA_MODULE('LDAP', autoproto='proto.h', subsystem='service', init_function='server_service_ldap_init', - deps='CREDENTIALS cli-ldap SAMDB process_model gensec samba-hostconfig samba_server_gensec' + deps='CREDENTIALS cli-ldap samdb process_model gensec samba-hostconfig samba_server_gensec' ) diff --git a/source4/ntp_signd/wscript_build b/source4/ntp_signd/wscript_build index 87e043ddda..f320b4a0fe 100644 --- a/source4/ntp_signd/wscript_build +++ b/source4/ntp_signd/wscript_build @@ -4,6 +4,6 @@ bld.SAMBA_MODULE('NTP_SIGND', source='ntp_signd.c', subsystem='service', init_function='server_service_ntp_signd_init', - deps='SAMDB NDR_NTP_SIGND LIBTSOCKET LIBSAMBA_TSOCKET' + deps='samdb NDR_NTP_SIGND LIBTSOCKET LIBSAMBA_TSOCKET' ) diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index 497a0e51ad..b2f71fff6c 100644 --- a/source4/ntvfs/posix/wscript_build +++ b/source4/ntvfs/posix/wscript_build @@ -18,7 +18,7 @@ bld.SAMBA_MODULE('pvfs_acl_nfs4', source='pvfs_acl_nfs4.c', subsystem='pvfs_acl', init_function='pvfs_acl_nfs4_init', - deps='NDR_NFS4ACL SAMDB' + deps='NDR_NFS4ACL samdb' ) @@ -41,7 +41,7 @@ bld.SAMBA_MODULE('ntvfs_posix', bld.SAMBA_PYTHON('python_xattr_native', source='python/pyxattr_native.c', - deps='ndr ldb SAMDB CREDENTIALS pyparam_util wrap_xattr attr', + deps='ndr ldb samdb CREDENTIALS pyparam_util wrap_xattr attr', realname='samba/xattr_native.so' ) diff --git a/source4/ntvfs/unixuid/wscript_build b/source4/ntvfs/unixuid/wscript_build index 29ef43c1c3..fe5620886a 100644 --- a/source4/ntvfs/unixuid/wscript_build +++ b/source4/ntvfs/unixuid/wscript_build @@ -4,6 +4,6 @@ bld.SAMBA_MODULE('ntvfs_unixuid', source='vfs_unixuid.c', subsystem='ntvfs', init_function='ntvfs_unixuid_init', - deps='SAMDB' + deps='samdb' ) diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index 742982edfb..7f73d96170 100644 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -60,7 +60,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' + deps='DCERPC_COMMON samdb NDR_UNIXINFO LIBWBCLIENT_OLD' ) @@ -69,7 +69,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' + deps='samdb DCERPC_COMMON ndr-standard' ) @@ -95,7 +95,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-session' + deps='samdb DCERPC_COMMON ndr-standard LIBCLI_AUTH NDR_DSSETUP com_err security-session' ) @@ -112,7 +112,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-session' + deps='samdb DCERPC_COMMON NDR_DRSUAPI security-session' ) diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build index f952dfb88d..9109fcfff1 100644 --- a/source4/torture/drs/wscript_build +++ b/source4/torture/drs/wscript_build @@ -5,7 +5,7 @@ bld.SAMBA_MODULE('TORTURE_DRS', autoproto='proto.h', subsystem='smbtorture', init_function='torture_drs_init', - deps='samba-util ldb POPT_SAMBA errors torture LDBSAMBA talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS ASN1_UTIL SAMDB NDR_DRSBLOBS CREDENTIALS samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain', + deps='samba-util ldb POPT_SAMBA errors torture LDBSAMBA talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS ASN1_UTIL samdb NDR_DRSBLOBS CREDENTIALS samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain', internal_module=True ) diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build index a57d6f8fee..1c4c94bdfd 100644 --- a/source4/torture/local/wscript_build +++ b/source4/torture/local/wscript_build @@ -5,6 +5,6 @@ bld.SAMBA_MODULE('TORTURE_LOCAL', autoproto='proto.h', subsystem='smbtorture', init_function='torture_local_init', - deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION ldb SAMDB nss_wrapper socket_wrapper replace-test', + deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION ldb samdb nss_wrapper socket_wrapper replace-test', internal_module=True ) diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index d843fc129f..c154da33aa 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -102,7 +102,7 @@ bld.SAMBA_MODULE('TORTURE_UNIX', bld.SAMBA_MODULE('TORTURE_LDAP', source='ldap/common.c ldap/basic.c ldap/schema.c ldap/uptodatevector.c ldap/cldap.c ldap/cldapbench.c ldap/ldap_sort.c ldap/nested_search.c', subsystem='smbtorture', - deps='cli-ldap LIBCLI_CLDAP SAMDB POPT_CREDENTIALS torture LDBSAMBA', + deps='cli-ldap LIBCLI_CLDAP samdb POPT_CREDENTIALS torture LDBSAMBA', internal_module=True, autoproto='ldap/proto.h', init_function='torture_ldap_init' diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build index cc2a574f7c..7f377dd81e 100644 --- a/source4/utils/wscript_build +++ b/source4/utils/wscript_build @@ -11,6 +11,6 @@ bld.SAMBA_BINARY('ntlm_auth', bld.SAMBA_BINARY('oLschema2ldif', source='oLschema2ldif.c', manpages='man/oLschema2ldif.1', - deps='ldb-cmdline SAMDB POPT_SAMBA' + deps='ldb-cmdline samdb POPT_SAMBA' ) -- cgit