The branch, master has been updated via ac57cfd libsamba-util: Build in libbitmap. via 221a79a policy: Rename to samba-policy to avoid name space clashes. via 47a41c8 cli_composite: Lowercase name. via 23cbfef cli_smb_common: Lowercase name. via 08785dd cli_cldap: Lowercase name. via 8a6bc73 cli_spools: Lowercase name. from aa3f10c s3: Fix MIT trusts
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit ac57cfda9d9a530b8759c65986c9e5a7f1105d3c Author: Jelmer Vernooij <jel...@samba.org> Date: Tue Jul 26 13:29:00 2011 +0200 libsamba-util: Build in libbitmap. Autobuild-User: Jelmer Vernooij <jel...@samba.org> Autobuild-Date: Tue Jul 26 14:45:27 CEST 2011 on sn-devel-104 commit 221a79ad008f839dae892e4b7f1a396c50442ecb Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Jul 25 22:32:12 2011 +0200 policy: Rename to samba-policy to avoid name space clashes. commit 47a41c8daf4df59f4d80723c38749209c044d1a4 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Jul 25 22:27:17 2011 +0200 cli_composite: Lowercase name. commit 23cbfef542013193fad54963fbf8a886740e9b00 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Jul 25 21:24:35 2011 +0200 cli_smb_common: Lowercase name. commit 08785dd73d39954fa02c2cb15947613b7e27494f Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Jul 25 21:24:20 2011 +0200 cli_cldap: Lowercase name. commit 8a6bc7331b71a7040fa9ee577776eb23b976c42d Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Jul 25 21:23:31 2011 +0200 cli_spools: Lowercase name. ----------------------------------------------------------------------- Summary of changes: lib/util/wscript_build | 9 +-------- libcli/cldap/wscript_build | 2 +- libcli/smb/wscript_build | 4 ++-- source3/wscript_build | 20 ++++++++++---------- source4/cldap_server/wscript_build | 2 +- .../policy/{policy.pc.in => samba-policy.pc.in} | 4 ++-- source4/lib/policy/wscript_build | 6 +++--- source4/lib/socket/wscript_build | 2 +- source4/libcli/ldap/wscript_build | 2 +- source4/libcli/wscript_build | 10 +++++----- source4/libnet/wscript_build | 2 +- source4/param/wscript_build | 4 ++-- source4/samba_tool/wscript_build | 2 +- source4/torture/wscript_build | 2 +- 14 files changed, 32 insertions(+), 39 deletions(-) rename source4/lib/policy/{policy.pc.in => samba-policy.pc.in} (79%) Changeset truncated at 500 lines: diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 659cb54..ee963ad 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -7,7 +7,7 @@ bld.SAMBA_LIBRARY('samba-util', signal.c system.c params.c util.c util_id.c util_net.c util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c util_str.c util_str_common.c substitute.c ms_fnmatch.c - server_id.c dprintf.c parmlist.c''', + server_id.c dprintf.c parmlist.c bitmap.c''', deps='DYNCONFIG', public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset', public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h', @@ -85,10 +85,3 @@ bld.SAMBA_LIBRARY('tdb-wrap', private_library=True, local_include=False ) - -bld.SAMBA_LIBRARY('bitmap', - source='bitmap.c', - deps='talloc samba-util', - local_include=False, - private_library=True) - diff --git a/libcli/cldap/wscript_build b/libcli/cldap/wscript_build index 9dd94c6..c6257b2 100644 --- a/libcli/cldap/wscript_build +++ b/libcli/cldap/wscript_build @@ -1,7 +1,7 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('LIBCLI_CLDAP', +bld.SAMBA_LIBRARY('cli_cldap', source='cldap.c', public_deps='cli-ldap', deps='LIBTSOCKET samba-util UTIL_TEVENT ldb LIBCLI_NETLOGON', diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build index 0d74e26..84ca225 100644 --- a/libcli/smb/wscript_build +++ b/libcli/smb/wscript_build @@ -1,9 +1,9 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('LIBCLI_SMB_COMMON', +bld.SAMBA_LIBRARY('cli_smb_common', source='smb2_create_blob.c util.c', autoproto='smb_common_proto.h', public_deps='talloc samba-util', - private_library=True + private_library=True ) diff --git a/source3/wscript_build b/source3/wscript_build index 414cf83..40a1d9b 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -820,7 +820,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP', bld.SAMBA3_LIBRARY('libsmb', source=LIBSMB_SRC, - deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON util_cmdline tevent', + deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT cli_smb_common util_cmdline tevent', vars=locals(), private_library=True) @@ -831,7 +831,7 @@ bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI', bld.SAMBA3_SUBSYSTEM('CLDAP', source='libads/cldap.c', - deps='cli-ldap-common LIBCLI_CLDAP LIBTSOCKET', + deps='cli-ldap-common cli_cldap LIBTSOCKET', vars=locals()) bld.SAMBA3_SUBSYSTEM('SECRETS3', @@ -880,7 +880,7 @@ bld.SAMBA3_LIBRARY('smbconf', bld.SAMBA3_LIBRARY('smbd_conn', source='smbd/conn.c', - deps='string_init bitmap namearray', + deps='string_init samba-util namearray', private_library=True) bld.SAMBA3_LIBRARY('smbd_base', @@ -892,9 +892,9 @@ bld.SAMBA3_LIBRARY('smbd_base', vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO smbconf REG_FULL FNAME_UTIL - LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS + LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON cli_spoolss RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR - LIBCLI_SMB_COMMON RPC_SERVER smbd_conn param_service + cli_smb_common RPC_SERVER smbd_conn param_service smbd_shim ''', private_library=True, @@ -922,7 +922,7 @@ bld.SAMBA3_SUBSYSTEM('PRINTBACKEND', bld.SAMBA3_LIBRARY('printing_migrate', source='printing/nt_printing_migrate.c rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c', - deps='NDR_NTPRINTING LIBCLI_SPOOLSS RPC_NDR_WINREG LIBCLI_WINREG param', + deps='NDR_NTPRINTING cli_spoolss RPC_NDR_WINREG LIBCLI_WINREG param', vars=locals(), private_library=True) @@ -1073,7 +1073,7 @@ bld.SAMBA3_SUBSYSTEM('LIBRPCCLI_NETLOGON', source=LIBRPCCLI_NETLOGON_SRC, deps='RPC_NDR_NETLOGON') -bld.SAMBA3_LIBRARY('LIBCLI_SPOOLSS', +bld.SAMBA3_LIBRARY('cli_spoolss', source=LIBCLI_SPOOLSS_SRC, deps='RPC_NDR_SPOOLSS param SECRETS3', private_library=True) @@ -1152,7 +1152,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient', param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 ads SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO RPC_CLIENT_SCHANNEL - LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS + LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON cli_spoolss RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS RPC_NDR_DRSUAPI RPC_NDR_NTSVCS RPC_NDR_EVENTLOG INIT_NETLOGON INIT_SAMR @@ -1164,7 +1164,7 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3, deps='''talloc tdb_compat cap popt_samba3 passdb libsmb smbd_shim param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA - LIBCLI_SMB_COMMON''', + cli_smb_common''', vars=locals()) bld.SAMBA3_BINARY('net', @@ -1175,7 +1175,7 @@ bld.SAMBA3_BINARY('net', LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL REGFIO NDR_NTPRINTING RPC_NDR_WINREG RPC_CLIENT_SCHANNEL TOKEN_UTIL - LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS + LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON cli_spoolss RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_SVCCTL RPC_NDR_DSSETUP RPC_NDR_INITSHUTDOWN RPC_NDR_DRSUAPI INIT_NETLOGON INIT_SAMR printing_migrate diff --git a/source4/cldap_server/wscript_build b/source4/cldap_server/wscript_build index f105c0e..6ffdb4a 100644 --- a/source4/cldap_server/wscript_build +++ b/source4/cldap_server/wscript_build @@ -12,6 +12,6 @@ bld.SAMBA_MODULE('service_cldap', bld.SAMBA_SUBSYSTEM('CLDAPD', source='netlogon.c rootdse.c', autoproto='proto.h', - deps='LIBCLI_CLDAP ldbsamba' + deps='cli_cldap ldbsamba' ) diff --git a/source4/lib/policy/policy.pc.in b/source4/lib/policy/samba-policy.pc.in similarity index 79% rename from source4/lib/policy/policy.pc.in rename to source4/lib/policy/samba-policy.pc.in index fe5c66d..3247ae3 100644 --- a/source4/lib/policy/policy.pc.in +++ b/source4/lib/policy/samba-policy.pc.in @@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: policy +Name: samba-policy Description: Active Directory Group Policy library Requires: talloc Requires.private: ldb Version: @PACKAGE_VERSION@ -Libs: @LIB_RPATH@ -L${libdir} -lpolicy +Libs: @LIB_RPATH@ -L${libdir} -lsamba-policy Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build index 646b6cc..3896357 100644 --- a/source4/lib/policy/wscript_build +++ b/source4/lib/policy/wscript_build @@ -1,8 +1,8 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('policy', +bld.SAMBA_LIBRARY('samba-policy', source='gp_ldap.c gp_filesys.c gp_manage.c gp_ini.c', - pc_files='policy.pc', + pc_files='samba-policy.pc', public_deps='ldb samba-net', vnum='0.0.1', pyembed=True @@ -10,6 +10,6 @@ bld.SAMBA_LIBRARY('policy', bld.SAMBA_PYTHON('py_policy', source='pypolicy.c', - public_deps='policy pytalloc-util', + public_deps='samba-policy pytalloc-util', realname='samba/policy.so' ) diff --git a/source4/lib/socket/wscript_build b/source4/lib/socket/wscript_build index c10970d..da0b380 100644 --- a/source4/lib/socket/wscript_build +++ b/source4/lib/socket/wscript_build @@ -24,6 +24,6 @@ bld.SAMBA_MODULE('socket_unix', bld.SAMBA_SUBSYSTEM('samba_socket', source='socket.c access.c connect_multi.c connect.c', public_deps='talloc LIBTSOCKET', - deps='LIBCLI_COMPOSITE LIBCLI_RESOLVE socket_ip socket_unix' + deps='cli_composite LIBCLI_RESOLVE socket_ip socket_unix' ) diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build index 99b6c4e..f7afec7 100644 --- a/source4/libcli/ldap/wscript_build +++ b/source4/libcli/ldap/wscript_build @@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('cli-ldap', autoproto='ldap_proto.h', public_deps='errors tevent LIBPACKET', public_headers='libcli_ldap.h:ldap-util.h', - deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS ndr LP_RESOLVE gensec cli-ldap-common', + deps='cli_composite samba_socket NDR_SAMR LIBTLS ndr LP_RESOLVE gensec cli-ldap-common', private_library=True ) diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index ce4eead..0672a64 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -17,7 +17,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LSA', ) -bld.SAMBA_SUBSYSTEM('LIBCLI_COMPOSITE', +bld.SAMBA_SUBSYSTEM('cli_composite', source='composite/composite.c', autoproto='composite/proto.h', public_deps='events' @@ -28,7 +28,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE', source='smb_composite/loadfile.c smb_composite/savefile.c smb_composite/connect.c smb_composite/sesssetup.c smb_composite/fetchfile.c smb_composite/appendacl.c smb_composite/fsinfo.c smb_composite/smb2.c', autoproto='smb_composite/proto.h', deps='LIBCLI_SMB2 UTIL_TEVENT', - public_deps='LIBCLI_COMPOSITE credentials gensec LIBCLI_RESOLVE tevent' + public_deps='cli_composite credentials gensec LIBCLI_RESOLVE tevent' ) @@ -63,7 +63,7 @@ bld.SAMBA_SUBSYSTEM('LP_RESOLVE', bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS', source='finddcs_nbt.c finddcs_cldap.c', autoproto='finddcs_proto.h', - public_deps='cli-nbt MESSAGING RPC_NDR_IRPC LIBCLI_CLDAP' + public_deps='cli-nbt MESSAGING RPC_NDR_IRPC cli_cldap' ) @@ -78,8 +78,8 @@ bld.SAMBA_LIBRARY('cli_raw', source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c', autoproto='raw/raw_proto.h', public_deps='samba_socket LIBPACKET LIBCRYPTO', - deps='LIBCLI_COMPOSITE LIBCLI_RESOLVE security ndr samba-util errors charset talloc LIBCLI_SMB_COMPOSITE tevent NDR_NBT_BUF LIBCLI_SMB_COMMON', - private_library=True + deps='cli_composite LIBCLI_RESOLVE security ndr samba-util errors charset talloc LIBCLI_SMB_COMPOSITE tevent NDR_NBT_BUF cli_smb_common', + private_library=True ) bld.RECURSE('smb2') diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build index ded944a..54c901a 100644 --- a/source4/libnet/wscript_build +++ b/source4/libnet/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('samba-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 ndr smbpasswdparser PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err', + public_deps='credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSYNC HDB_SAMBA4 LIBTSOCKET com_err', private_library=True ) diff --git a/source4/param/wscript_build b/source4/param/wscript_build index d5ca60d..9a45512 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -15,10 +15,10 @@ bld.SAMBA_LIBRARY('samba-hostconfig', pc_files='samba-hostconfig.pc', vnum='0.0.1', deps='DYNCONFIG', - public_deps='samba-util bitmap param_local_h', + public_deps='samba-util param_local_h', public_headers='param.h', autoproto='param_proto.h', - autoproto_extra_source='../../lib/param/param_functions.c' + autoproto_extra_source='../../lib/param/param_functions.c' ) diff --git a/source4/samba_tool/wscript_build b/source4/samba_tool/wscript_build index 88b55eb..75ff71f 100644 --- a/source4/samba_tool/wscript_build +++ b/source4/samba_tool/wscript_build @@ -3,6 +3,6 @@ bld.SAMBA_BINARY('samba-tool', source='samba_tool.c password.c vampire.c gpo.c', autoproto='proto.h', - deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS policy auth4', + deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS samba-policy auth4', pyembed=True ) diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index fbae17e..b3826d6 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 cli_cldap samdb POPT_CREDENTIALS torture ldbsamba', internal_module=True, autoproto='ldap/proto.h', init_function='torture_ldap_init' -- Samba Shared Repository