From: Jelmer Vernooij Date: Mon, 4 Oct 2010 22:36:21 +0000 (+0200) Subject: Add missing dependencies for com_err. X-Git-Url: http://git.samba.org/?a=commitdiff_plain;ds=sidebyside;h=5548d3d41e3db378802e614656d3f708a3edd214;p=mat%2Fsamba.git Add missing dependencies for com_err. --- diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build index 1cfde8db4c..fad29c8f69 100644 --- a/source4/auth/credentials/wscript_build +++ b/source4/auth/credentials/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS', source='credentials.c credentials_files.c credentials_ntlm.c credentials_krb5.c ../kerberos/kerberos_util.c', autoproto='credentials_proto.h', - public_deps='LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB gssapi', + public_deps='LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB gssapi com_err', public_headers='credentials.h', deps='SECRETS SAMDB' ) diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index 30dfb64157..cf3d783350 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -6,6 +6,7 @@ bld.SAMBA_LIBRARY('gensec', autoproto='gensec_proto.h', public_deps='CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba_socket LIBPACKET LIBTSOCKET UTIL_TEVENT', public_headers='gensec.h', + deps='com_err', vnum='0.0.1' ) diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build index 435601d5e5..0c1828a55b 100644 --- a/source4/auth/kerberos/wscript_build +++ b/source4/auth/kerberos/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('KERBEROS', source='kerberos.c clikrb5.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c', autoproto='proto.h', - public_deps='krb5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE', + public_deps='krb5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE com_err', deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET LIBNDR' ) diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index 083ec6c84c..b59fce3624 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -139,7 +139,7 @@ bld.SAMBA_MODULE('ldb_password_hash', subsystem='ldb', init_function='LDB_MODULE(password_hash)', internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'), - deps='talloc LIBEVENTS SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS HEIMDAL_HDB_KEYS krb5' + deps='talloc LIBEVENTS SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS HEIMDAL_HDB_KEYS krb5 com_err' ) @@ -212,7 +212,7 @@ bld.SAMBA_MODULE('ldb_update_keytab', subsystem='ldb', init_function='LDB_MODULE(update_keytab)', internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'), - deps='talloc LIBEVENTS CREDENTIALS ldb' + deps='talloc LIBEVENTS CREDENTIALS ldb com_err' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 92a367db18..784d93bcd4 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -6,7 +6,7 @@ bld.SAMBA_SUBSYSTEM('SAMDB', source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c', autoproto='samdb/samdb_proto.h', public_deps='krb5', - deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL' + deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL com_err' ) @@ -54,6 +54,6 @@ bld.SAMBA_PYTHON('python_dsdb', # 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', + deps='SAMDB pyldb_util dcerpc com_err', realname='samba/dsdb.so' ) diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 5bf923a16b..2b08dcec93 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -551,7 +551,7 @@ HEIMDAL_LIBRARY('kdc', includes='../heimdal/kdc', autoproto='../heimdal/kdc/kdc-protos.h', autoproto_private='../heimdal/kdc/kdc-private.h', - deps='roken krb5 hdb HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm HEIMDAL_HCRYPTO', + deps='roken krb5 hdb HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm HEIMDAL_HCRYPTO com_err', ) @@ -624,7 +624,7 @@ HEIMDAL_LIBRARY('gssapi', ../heimdal/lib/gssapi/mech/gss_export_sec_context.c ../heimdal/lib/gssapi/mech/gss_inquire_context.c ../heimdal/lib/gssapi/mech/gss_release_name.c ../heimdal/lib/gssapi/mech/gss_set_cred_option.c ../heimdal/lib/gssapi/mech/gss_pseudo_random.c gssapi-glue.c''', includes='../heimdal/lib/gssapi ../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech', - deps='HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 roken krb5', + deps='HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 roken krb5 com_err', ) diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build index 517308655f..9c516c3e96 100644 --- a/source4/kdc/wscript_build +++ b/source4/kdc/wscript_build @@ -4,16 +4,16 @@ bld.SAMBA_MODULE('KDC', source='kdc.c kpasswdd.c', subsystem='service', init_function='server_service_kdc_init', - deps='kdc HDB_SAMBA4 WDC_SAMBA4 LIBSAMBA-HOSTCONFIG LIBTSOCKET LIBSAMBA_TSOCKET', - local_include=False + deps='kdc HDB_SAMBA4 WDC_SAMBA4 LIBSAMBA-HOSTCONFIG LIBTSOCKET LIBSAMBA_TSOCKET com_err', + local_include=False ) bld.SAMBA_SUBSYSTEM('HDB_SAMBA4', source='hdb-samba4.c', - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb DB_GLUE LIBSAMBA-HOSTCONFIG', - includes='../heimdal/kdc', - local_include=False + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb DB_GLUE LIBSAMBA-HOSTCONFIG com_err', + includes='../heimdal/kdc', + local_include=False ) @@ -21,7 +21,7 @@ bld.SAMBA_SUBSYSTEM('WDC_SAMBA4', source='wdc-samba4.c', local_include_first=False, includes='../heimdal/kdc', - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb PAC_GLUE LIBSAMBA-HOSTCONFIG' + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb PAC_GLUE LIBSAMBA-HOSTCONFIG com_err' ) @@ -29,21 +29,21 @@ bld.SAMBA_SUBSYSTEM('PAC_GLUE', source='pac-glue.c', local_include_first=False, includes='../heimdal/kdc', - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb LIBSAMBA-HOSTCONFIG' + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb LIBSAMBA-HOSTCONFIG com_err' ) bld.SAMBA_SUBSYSTEM('DB_GLUE', source='db-glue.c', local_include=False, - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb LIBSAMBA-HOSTCONFIG' + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb LIBSAMBA-HOSTCONFIG com_err' ) bld.SAMBA_SUBSYSTEM('MIT_SAMBA', source='mit_samba.c', local_include=False, - deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb DB_GLUE PAC_GLUE LIBSAMBA-HOSTCONFIG' + deps='ldb auth_sam auth_sam_reply CREDENTIALS hdb DB_GLUE PAC_GLUE LIBSAMBA-HOSTCONFIG com_err' ) diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c index 25f4661dce..fe7e8a1f3d 100644 --- a/source4/lib/ldb/pyldb.c +++ b/source4/lib/ldb/pyldb.c @@ -2744,4 +2744,6 @@ void initldb(void) PyModule_AddObject(m, "MessageElement", (PyObject *)&PyLdbMessageElement); PyModule_AddObject(m, "Module", (PyObject *)&PyLdbModule); PyModule_AddObject(m, "Tree", (PyObject *)&PyLdbTree); + + PyModule_AddObject(m, "__version__", PyString_FromString(PACKAGE_VERSION)); } diff --git a/source4/lib/ldb/tests/python/api.py b/source4/lib/ldb/tests/python/api.py index 76de853ac7..b8adbaaf54 100755 --- a/source4/lib/ldb/tests/python/api.py +++ b/source4/lib/ldb/tests/python/api.py @@ -611,6 +611,12 @@ class ModuleTests(unittest.TestCase): self.assertEquals(["init"], ops) +class VersionTests(unittest.TestCase): + + def test_version(self): + self.assertTrue(isinstance(ldb.__version__, str)) + + if __name__ == '__main__': import unittest unittest.TestProgram() diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 226175778e..ddf12835aa 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -139,7 +139,8 @@ def build(bld): bld.SAMBA_PYTHON('pyldb', 'pyldb.c', deps='ldb pyldb_util', - realname='ldb.so') + realname='ldb.so', + cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) bld.SAMBA_MODULE('ldb_paged_results', 'modules/paged_results.c', diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build index c9c76e9cc1..988fda70a6 100644 --- a/source4/libnet/wscript_build +++ b/source4/libnet/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('LIBSAMBA-NET', source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libnet_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_domain.c libnet_samsync.c libnet_export_keytab.c', autoproto='libnet_proto.h', - public_deps='CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET' + public_deps='CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err' ) diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index f0ce131e7a..61241fcf4b 100644 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -89,7 +89,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' + deps='SAMDB DCERPC_COMMON NDR_STANDARD LIBCLI_AUTH NDR_DSSETUP com_err' ) diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index 6bfb828156..ddbf70af43 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -73,7 +73,7 @@ bld.SAMBA_MODULE('TORTURE_AUTH', source='auth/ntlmssp.c auth/pac.c', autoproto='auth/proto.h', subsystem='smbtorture', - deps='LIBCLI_SMB gensec auth KERBEROS POPT_CREDENTIALS SMBPASSWD torture', + deps='LIBCLI_SMB gensec auth KERBEROS POPT_CREDENTIALS SMBPASSWD torture com_err', internal_module=True )