[SCM] Samba Shared Repository - branch v4-0-stable updated
Karolin Seeger
kseeger at samba.org
Thu Sep 13 04:19:00 MDT 2012
The branch, v4-0-stable has been updated
via 2050b48 VERSION: Release Samba 4.0.0rc1
via e75e768 WHATSNEW: prepare release notes for 4.0.0rc1
via e2accc4 build:dist: call source3/autogen.sh and packaged generated files
via 6895875 build:dist: call build-manpages-nogit for make dist and package generated files
via d28f36d build:dist: extend meaning of DIST_FILES to also recurse into directories
via 36b2732 build:dist: make use of file / distfile more obvious in handling of DIST_FILES in "make dist"
via 3821def build:dist: for snapshot builds, call DIST_DIRS with extend=True
via 8ea2a46 build:dist: extend samba_dist.DIST_FILES() to take optional parameter extend(=False)
via 4989a9d build:waf dist: factor out function to add list of files to the tarball
via c33643e s3:build: rewrite autogen.sh to be called from any directory
via b938979 release-scripts: run build-manpages-nogit with bash
via 3c5d2d5 release-scripts: run build-manpages-git with bash
via cfdab79 release-scripts: let build-manpages-nogit store generated docs under ./bin/docs
via 068ae48 release-scripts: let build-manpages-git store generated docs under bin/docs/
via f5a2379 In vfs modules, don't use 'conn->origpath' when we really mean 'conn->cwd'.
via b6636af Move cached cwd onto conn struct.
via a8676e6 Remove ancient "optimization" global LastDir.
via 893b213 Avoid overriding default ccache for ads operations.
via a11e45f selftest: let provision_plugin_s4_dc use SMB3
via 72720d6 wintest: Fix --use-ntvfs handling
via ee4d1c4 wintest: Rework support for the internal DNS server
via fee7575 s4 provision: Ask for the dns forwarder IP address during interactive provision
via 1627fcd dns_server: Remove parameter 'dns recursive queries' and base this on 'dns forwarder'
via 5cac79a wintest: try to fix settings for the internal dns server
via 1b848ec lib/param: change the default for 'allow dns updates' to 'secure only'
via ea1841e lib/param: add some more alias for 'allow dns updates' options.
via 2df6142 WHATSNEW.txt: Update DNS server description
via 9583366 s4:dns_server: remove wrong and unused dsdb_check_access_on_dn() check
via 61a07df dns_server: Attempt to SET and UNSET the sessionInfo to match the incoming user
via c4aef88 s4:samba_upgradedns: delete dns-HOSTNAME account if using the internal dns server
via 1e00c0d selftest:Samba4: don't provision with BIND9_DLZ
via 0c55510 s4:upgradehelpers.py: don't require a dns-$HOSTNAME account
via 50084e5 s4:provision: don't add the dns-HOSTNAME account if we use the internal dns server
via 6ff5884 loadparm: dns is now a default server service
via 56058ea s4 dns: use the internal DNS server per default
via 2af8129 s4 dns: Add libaddns-based simple tests
via 76801b5 s4 dns: Run python tests in fl2003dc env
via cf3aab6 s4 dns: Improve logging of delegated dns updates
via aa1e84a s4:selftest: run thet dlz_bind9. tests in the chgdcpass env
via 51a4094 s3: remove unneeded noquota.c file
via 1f8c9ab s3-rap: Open printers with the right access mask.
via 937cdd1 docs: Build manpages correctly.
via 66a87d7 wafsamba: Add a SAMBAMANPAGES function.
via 66d926f docs: Bump version up to 4.0.
via 2eb429d docs: Fix typo.
via 45f8f97 lib/krb5_wrap: when deleting default realm, pass char*, not char**
via d55980c s3-pdb: filter out more symbols only used in ldapsam internals
via 34bd3cb WHATSNEW: provision and updateprovision have new names
via 2c42550 s4:scripting: rename upgradeprovision -> samba_upgradeprovision
via a0baaf2 s4:setup: remove standalone 'provision'
via e8375dd smbd: Add extra VFS hooks to get the posix ACL as a blob
via 6638d10 smbd: Remove pre-allocation of ACL array in sys_acl_init()
via ac804f0 smbd-posix_acls: Use a IDL union to store the ACL entry
via bd2f160 Make metze happy and the code clearer :-).
via 4e595f4 nsswitch: fix crash on null pam change pw response
via df5f962 s4:torture:smb2: fix error reporting in the oplock-brl3 test
via 439c907 s4:torture:smb2: fix error reporting in the oplock-brl2 test
via e9df135 s4:torture:smb2: fix error reporting in the oplock-brl1 test
via c960e55 s4:torture:smb2: remove an unused variable from the oplock-exclusive2 test
via 7c6f1fb s4:torture:smb2: remove an unused variable from the oplock-exclusive1 test
via 7c1fd74 At Michael's suggestion, factor common code into a function. My bad :-).
via 33d9a22 smbd: Print ACL used to create hash in vfs_xattr_common
via 6fbce90 provision: Only give the "no posix ACLs" exception if we could not set the SD
via 1a3d6de torture: Add discard_const_p() to work around dlz_create prototype
via 69c2e18 selftest: we fail the smb2.durable-open.delete_on_close2 test
via a4358f6 s4:torture:smb2: add a durable-open.delete_on_close2 test
via 675871f selftest: pass smb2.durable-open.delete_on_close1
via f244b29 selftest: smb2.durable-open.delete_on_close1 is not flapping any more
via 3d7196d s4:torture:smb2: fix the durable-open.delete_on_close1 test
via d237427 lib/replace: remove duplicate check for inotify
via b657668 docs: Move idmap manpage to there old location.
via b719e67 docs: Bump version up to 4.0.
via 5b4a7ae selftest/Samba4: make use of samba-tool domain provision
via 1d085f6 wintest: make use of samba-tool domain provision
via 52ba3c8 testprogs/blackbox: make use of samba-tool domain provision
via fdd2a7e s4:setup/tests: make use of samba-tool domain provision
via 318770a s4:scripting: install samba_kcc to SBINDIR
via 15c793f s4:scripting: use the 'sbin_files' variable
via a4fc79f s4:samba-tool: add 'samba-tool domain provision'
via ca3f285 s4:python/netcmd: give the Commad implementations access to the raw arguments
via 7f98cf1 s4:samba-tool: remove unused code in testparm.py
via 475755e s4:samba-tool: allow sys.exit(ret) to control the exit code
via 5de7a3d quota: move function again to its belonging ifdef block
via da747fa s3:proto.h: remove duplicate disk_quotas prototypes
via f602640 quota: fix configure test for HP-UX
via 6a1fa3e samba3.smb2.durable-open.delete_on_close1 is now flapping (sometimes passes).
via 79f0524 s3: Run raw.oplock
via 814dc3c smbtorture: Test that delete requests are not special
via ab70954 s3: delete requests are not special
via 008bb29 Set trans to a value that is not LDB_SUCCESS (all LDB_ constants are positive) so that any "goto failed:" call does not end up calling ldb_transaction_cancel() if trans is initialized to 0 (LDB_SUCCESS) by chance.
via da731c1 Call TALLOC_FREE() before we return otherwise we will never free sam_account
via ba5f557 Fix talloc memory heirarchy bug. If there's an SMB2 sessionsetup in flight when we're shut down, we end up freeing the struct smbXsrv_session *session pointer twice.
via cfeac09 Fix bug #9147 - winbind can't fetch user or group info from AD via LDAP
via 56d97d1 wafbuild: add defines for linux quota and sysquota support
via 624e51a s3:smbd Bump the smbd vfs interface version to 30
via 5765d73 s3:vfs/time_audit: Add back pointer for sys_acl_delete_def_file_fn
via dc9b622 s3:vfs/time_audit: add path names to log messages
via cf7f685 s3:client use more access bits for snapshot display
via ab33691 docs:build: make target "manpages" .PHONY, so manpages do get built...
via d709748 s3-passdb: update abi_match and ignore more statically linked functions
via 54f1ce4 docs: Rename htmlman3 -> htmlman.
via 06809f4 s4:provision: ask the admin about the desired DNS implementation
via e3b6b46 Force cast to long as on some platform tv_usec is 32bit long
via 9eb91a50 uid_t is a synonym for int on osX
via f2ec75c osX define uint64_t as long long int
via e5ecef6 WHATSNEW: list SMB3 as max protocol and durable handles as changes since 4.0 beta8
via ebdf147 docs: describe the new parameter "durable handles" in the smb.conf manpage
via 2491453 docs: add desciption of new parameter "kernel share modes" to the smb.conf manpage
via 4811e58 docs: have configure correctly report ability to build manpages
via eb4483e release-scripts: adapt build-manpages-nogit to renamed manpage directory
via f5da2c1 release-scripts: adapt build-manpages-git to moved manpage directory
via 2ea0f6c s3:quota-nfs: add RQ_PATHLEN define for systems that don't have it
via 79df06e s3:quota-nfs: another build fix for the old Unix world
via b89d988 s3: fix wrong invocations of talloc_realloc
via 7a51c5e selftest/knownfail: we pass some samba3.smb2.durable-* tests now
via eabe4c8 s3:vfs_default: add basic support for durable handle request and reconnect
via 1d012a6 s3: introduce a new share config option "durable handles" defaulting to "yes"
via ba011c1d s3:smbd: make fd_open() public
via f5a6b7b s3:smbd: don't set kernel flock if "kernel share modes = no"
via da07186 s3: add an option "kernel share modes" to be able to switch off using kernel flocks
via f2f47b4 loadparm: remove remnants of removed option "share modes"
via 3fef8e2 selftest/Samba3: don't explicitly set 'server max protocol'
via 196b7f3 docs-xml: change "server max protocol" to "SMB3"
via 1c9c5c1 s3:param: change "server max protocol" to "SMB3"
via 9576638 s3:smbd: add basic support for durable handle v2 request and reconnect
via 267b976 s3:smbd: add basic support for durable handle request and reconnect
via f935ebd s3:smbd: initial durable handle support: special treatment of durable handles in close
via 35260ae s3:vfs: add durable VFS operations
via eb1a05f s3:smbd: add disconnected checks to the open code.
via 42afa59 s3:smbd: also close durable file handles in a tdis
via f0a5b79 s3:locking: add brl_mark_disconnected() and brl_reconnect_disconnected()
via 9a81f8e s3:locking: add mark_share_mode_disconnected()
via bc29605 s3:smbXsrv_open: add smb2srv_open_recreate() to support durable handles
via 5e63494 s3:smbXsrv.idl: add properties for durable handles to smbXsrv_open_global0
via c853b68 s3:quota: don't add the string '"' into the argument list
via 869b677 doc: improve quotacommand man page docu
via 4abccf0 s3: Fix a panic when shutting down
via 0f284be s3:lib: use includes.h with cbuf and srprs
via 4931a90 s4:torture:smb2: simplify durable-open.file-position test to only use one I/O and one handle
via 97be058 s4:torture:smb2: change the durable-open.file-position test to use one connection only
via 3295630 s4:torture:smb2: fix durable-v2-open.reopen2 to pass against windows
via 1b96a6d s4:torture:smb2: simplify the durable-v2.reopen2 test (using only one i/o struct)
via fc0631c s4:torture:smb2: simplify the durable-v2-open.reopen1 test
via 67290e7 s4:torture:smb2: in the durable-v2-reopen1 test, use a minimal request
via d3946fe s4:torture:smb2: fix cut'n'paste error in the durable-v2-open.reopen2 test
via e1dd2fc s4:torture:smb2: fix name of test file in the durable-open.alloc-size test
via cd93c7d waf: add tests for NFS quota stuff
via 992908a waf: add test for HAVE_DQB_FSOFTLIMIT
via 58f6247 waf: make checks for different XFS flavours
via a7f0a07 s3:autoconf: look for irix xfs only when if we didn't find the Linux one before
via abf98e3 s3:sysquota_nfs: fix build on Tru64 et alii
via 0c0441b rpcserver: fix useless declaration warning
via 31e58a1 s3:sysquota-test: include ufs/ufs/quota.h only when found
via 5c3769b build: define _BSD_TYPES on IRIX to have types like u_short
via ee2d6ae s3:quota: clean up and consolidate the xfs quota checks and defines
via 3810ee4 s3:sysquota_xfs: fix logic so that we actually use this module on Linux
via d1623ec s3:sysquota_xfs: check and include the right fs header file for xfs quotas
via 1f61abd s3-smbd: Remove OSF1 support from old (pre-sysquotas) code
via 8299bd1 waf: add check for BSD_STYLE_STATVFS
via b317f75 s3-smbldap: make smbldap public library and maintain its ABI
via 140bb28 s3-smbldap: use smbldap_ prefixed functions
via edfe0c0 s3-smbldap: use smbldap_ prefix for all functions
via a43774a s3-waf: avoid exporting init symbols from statically linked modules
via dd2ab2e s4-torture: dns torture test depends on AD DC build
via d08242c s3-passdb: convert pdb_ipa to use secrets wrappers
via 57ce825 s3-passdb: convert pdb_ldap to use secrets wrappers
via c2e2857 s3-passdb: wrap secrets.tdb accessors used by PDB modules
via 9c3e294 wafsamba/samba_abi: allow negative matches in abi_match
via c63dcc9 gen_abi.sh: filter out symbols not needed for ABI
via 6b2e7aa wafsamba/samba_abi: fix signature parsing for structures
via b86c8fd waf: Fix bug #8801 - build s3fs manpages.
via b29dff8 waf: Rename nmblookup manpage to nmblookup4.
via 022e0ae docs: Remove old tdb manpages.
via 90c0e75 docs: Remove old ldb manpages.
via f0da7c5 waf: Create catalog file for manpage generation.
via 802708b wafsamba: Add a CONFIGURE_FILE option.
via 18eb505 wafsamba: Add support for manpages in SAMBA_MODULE.
via 51a3845 selftest/knownfail: samba3.smb2.durable-open.alloc-size fails currently
via 972bf34 s4:torture:smb2: add a test for alloc size behaviour under durable reconnect
via 36ea4ec param: remove unused define FN_LOCAL_PARM_CHAR()
via d0159f6 Free protect_ids in secret_store_domain_guid() as the caller of fetch_secrets() must free the result in order to not leak memory.
via 54ae7ca selftest/knownfail: samba3.smb2.durable-v2-open.reopen{1,2} fails currently
via 640752b s4:torture/smb2: add smb2.durable-v2-open.reopen{1,2} tests
via 1874ebe s4:torture/smb2: check that the server should ignore the fname in a DHnC request
via afaea04 s4:torture/smb2: don't expect a DHnQ response in a DHnC request
via 8ba8020 s4 dns: Make debug output less noisy
via 319b239 s4 dns: Check if signing user is allowed to update records
via 44fd8e7 fileserver:sysquotas: remove wrong cast
via d6cc08b s3:quota: don't force the block size to 512
via 146ad30 s3-smbd: Remove remaining references to removed OS support in old-style quota code
via 9bfab7e s3-smbd: Remove IRIX support from old (pre-sysquotas) code
via 79bc9e5 s3-smbd: Remove HPUX support from old (pre-sysquotas) code
via 8b90f6a s3-smbd: Remove BSD support from old (pre-sysquotas) code
via 28ccb67 s3-smbd: Remove Linux support from old (pre-sysquotas) code
via 040a458 s3-configure: Only use sysquotas by default
via 24013bd build: Remove Unicos support (quota in particular)
via b7b0d7d build: Do not compile lib/sysquotas*.c files as part of configure
via 82cffc2 s3: Fix 64-bit warnings in vfs_media_harmony
via a6df44b sysquota: we need to list nfs4 as a separate fs name for the sys_get_nfs_quota backend
via baf2db6 selftest: Test configure stage of dlz_bind9
via 52f0ded selftest: Add tests for the dlz_bind9 module
via 0d99175 join.py: Only replicate DNS zones if the source DC had DNS zones
via f453117 s3-printing: Restrict printing=cups to systems with cups development headers at build time
via e00ac55 Free protect_ids in secret_store_domain_sid() as the caller of fetch_secrets() must free the result in order to not leak memory. Signed-off-by: Jeremy Allison <jra at samba.org>
via 43d619b Add "backup_intent" bool to files_struct.
via d7fb237 Remove an unncessary FTRUNCATE call in the open path. We can rely on O_TRUC.
via 5e492f8 s4 dns: Allow configuring signed updates
via 2b17566 s4 dns: Make sure to remember incoming tkey name
via 53f602c s4 dns: Verify incoming TSIG signatures
via 7fe5e2c s4 dns: Handle GSS-TSIG signature creation
via 956f41b s4 dns: When we got a TKEY, we need to remember which key to use for signing
via e81d026 s4 dns: TKEY record needs to remember incoming algorithm
via c0e6a4b s4 dns: Move dns_find_tkey to an extra file
via 22fda8c s4 dns: Create IDL entry for TSIG-like record needed for signature check
via 58d8d94 s4-dns: Fix linking the dns service.
via 7b86c18 selftest: Add python blackbox tests for samba-tool ntacl get/set
via f9cee8d samba_tool: Improve samba-tool ntacl get/set to use the local sam.ldb SID
via 7b5ba30 samba_tool: Fix ntacl get to correctly output in sddl
via c19208e s4-provision: Fix error message to contain the string SSDL of the failed-to-match ACL
via 558fa4c s4 dns: Revert erroneous push from wrong branch
via 92bd7b0 s3:smb2_create: check for SMB2_CREATE_TAG_DHNC first
via a3eee54 s3:locking: fix trailing space in brl_close_fnum()
via 2311a2c s4 dns: Allow configuring signed updates
via b5dd26c s4 dns: Make sure to remember incoming tkey name
via 140a8d8 more tsig_verify stuff
via 17c91b5 drop me
via cf4333b hack: dns_sign_tsig correct memcpy
via a0c2453 HACK remove debug statement
via f3e44c3 s4 dns: Verify incoming TSIG signatures
via fc9de26 s4 dns: Handle GSS-TSIG signatures
via 15e3991 build: Remove unused deps from vfs modules
via 084978f s3: Slightly simplify fd_open_atomic
via d95d326 s3: Put a comment into the right place
via d0df12f s3: Fix a typo
via 63279e3 s3: Factor out disposition_to_open_flags
via f67a6c4 s3: Factor out calculation of clear_ads
via 0d86932 s3: Slightly simplify open_file_ntcreate
via 25bdc36 s3: Fix a comment
via 93e10db s3: Make "open_match_attributes" static
via 1c9b1e0 s3: Fix some nonempty blank lines
via 2fe08c8 s3: Fix memleaks in pylibsmb.c
via 2172a14 s3: in sys_popen(), add a debug message for failed fork
via c1b703f s3: in sys_popen(), add a debug message for failed extract_args()
via 6c7df39 s3: in sys_popen(), untangle function call from result check
via 1d4fe78 s3: in sys_popen(), untangle assigment from check and add a debug message in failure case
via d43c411 s3: in sys_popen(), improve call to pipe and report error to debug
via 243157a s3: in sys_popen(), validate input before opening the pipe.
via e7d385c s3: in sys_popen(), fix a debug message
via b1966f3 s3:smbd: in sys_disk_free(), improve a debug message
via cc99189 s3:smbd: in sys_disk_free(), improve a debug message
via 04ac781 s3:smbd: in sys_disk_free(), fix line length and indentation of debug statement
via a56d2de s3:smbd: in sys_disk_free(), fix a debug message
via 3390d99 s3-winbind: DON'T PANIC if we couldn't find the domain.
via 4def1c1 file_server: Remove explicit set of passdb backend in fileserver.conf
via 7afd476 build: sync the waf ACL checks with configure.in
via a566404 build: Remove references to charset modules - we no longer have these
via cac1ebf build: vfs_fake_acls does not need the acl lib
via 73932a3 file_server: Run task_server_terminate when smbd exists
via 8d3e193 file_server: use 'subreq' as variable instead of 'req'
via 2c9c589 build: remove unused HAVE_NO_ACLS define
via 4437547 s4-selftest: Try a more complex ACL - this example from a GPO
via 97a1f8d s4-selftest: Try to make ntacl unit tests better match their names
via 6c9d22d file_server: Clarify code by avoiding a goto
via 30253c1 s4-samba-tool: Ensure we also sync the SACL as well as the DACL during sysvolreset
via 9983ad7 s3-passdb: Rename pdb_samba4 to samba_dsdb and autoconfigure when we are a AD DC
via 68f68d0 docs: Move Samba4 HOWTO link into README
via 8be652a docs: Update Roadmap
via 3f42619 docs: Remove merged-branches.txt
via 0010828 docs: Remove docs for removed parameter 'display charset'
via 339fb7e remove extra tab from Makefile
via f9e8f08 docs: Fix undocumented target to find smb.conf directives in the right place
via 28499b0 docs: Remove references to security=share and security=server from the smb.conf docs
via 4a52a3f docs: Remove docs for removed parameter 'parinoid server security'
via 75484f4 docs: Rename manpages-3 -> manpages.
via 9c44e2e s4-docs: Remove empty s4 HOWTO Collection.
via 18c0d87 build: skip shipping the alpha13 provision in the release tarballs
via 2dd0e71 s4-classicupgrade: Show more clearly what is wrong with the Adminstrator SID
via 3b3d7bb build: Only make bin/ if it does not exist
via 3ad9c52 selftest: skip tests if the tarball did not include the alpha13 provision
via 05f9829 waf: add new quota header checks and sysquota_4B source file
via 9dd0e16 s3: remove some duplicate quota code
via af5dcaa s3: adopt the new sysquotas_4B support for BSD
via d392485 s3: add sysquotas_4B support
via d5f845c s3: Make an if statement a bit easier to read
via 5e0365d Now SEC_RIGHTS_PRIV_RESTORE and SEC_RIGHTS_PRIV_BACKUP don't include any generic bits (they're used directly in the fileserver where the generic bits have already been mapped into file specific bits) we need to add the generic bits to the test when we have these privileges.
via 6550bc0 Rewrite torture_samba3_rpc_sharesec() to use a non-privileged user for share security descriptor testing.
via 64e57a1 Add a comment showing where to set log level in tests.
via 4645564 Change the S3 fileserver over to se_file_access_check().
via 2b89e1a Factor out privilege checking code into se_file_access_check() which takes a bool priv_open_requested parameter.
via 69d925d SEC_RIGHTS_DIR_PRIV_BACKUP and SEC_RIGHTS_DIR_PRIV_RESTORE aren't used anywhere. Remove (can re-add if needed).
via 4d7dad1 s4-dsdb: Remove unused variables
via 8557c69 s4-kdc: Improve grammer and clarity of password change failure messages.
via f0a9180 s3: Fix warnings in aio_fork.c
via 2ffe690 s3: Remove a shadowing variable declaration
via 01ade93 s4-dsdb: Remove unused tmp_ctx leaked onto long-term ldb_context
via c256566 s4 dns: Store TKEYs in a ringbuffer
via e4505fc tdb: return unpack error on strdup failure
via 85706c4 s3: Fix a few "warning: ISO C90 forbids mixed declarations and code"
via 2eb606b s3:build fix autoconf build on RHEL5
via 3dfd179 s3:doc Fix name of timeout parameter in documentation
via 424492a s3:dbwrap_ctdb: Add DB name and key to warning message
via 7204dc9 s4 dns: Negotiate GSSAPI-based TKEYs
via d2c0387 s4-kdc: Give information on how long the password history is
via efec5a9 s4-libnet: Fix memory leak of lsa_RefDomainList and lsa_String onto libnet_ctx
via a5d57a0 auth/credentials: Do not print passwords in a talloc memory dump
via a3b67e5 VERSION: Move on to beta9
from 524876a VERSION: Mark as the beta8 release
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
README | 11 +-
Roadmap | 8 +-
VERSION | 4 +-
WHATSNEW.txt | 89 +-
auth/credentials/credentials.c | 8 +
buildtools/scripts/abi_gen.sh | 2 +-
buildtools/wafsamba/configure_file.py | 44 +
buildtools/wafsamba/samba_abi.py | 20 +-
buildtools/wafsamba/samba_dist.py | 76 +-
buildtools/wafsamba/wafsamba.py | 28 +-
docs-xml/Makefile | 35 +-
docs-xml/Makefile.settings.in | 4 +-
docs-xml/Samba3-HOWTO/manpages.xml | 120 +-
docs-xml/Samba4-HOWTO/ad-dc.xml | 4 -
docs-xml/Samba4-HOWTO/ad-member.xml | 4 -
docs-xml/Samba4-HOWTO/auth.xml | 4 -
docs-xml/Samba4-HOWTO/cifsfs.xml | 4 -
docs-xml/Samba4-HOWTO/compiling.xml | 24 -
docs-xml/Samba4-HOWTO/config.xml | 5 -
docs-xml/Samba4-HOWTO/domain-bdc.xml | 4 -
docs-xml/Samba4-HOWTO/domain-member.xml | 3 -
docs-xml/Samba4-HOWTO/domain-pdc.xml | 4 -
docs-xml/Samba4-HOWTO/gui-clients.xml | 4 -
docs-xml/Samba4-HOWTO/index.xml | 137 --
docs-xml/Samba4-HOWTO/ldb.xml | 4 -
docs-xml/Samba4-HOWTO/printing.xml | 11 -
docs-xml/Samba4-HOWTO/protocol.xml | 204 --
docs-xml/Samba4-HOWTO/registry.xml | 4 -
docs-xml/Samba4-HOWTO/samba.xml | 48 -
docs-xml/Samba4-HOWTO/security=share.xml | 8 -
docs-xml/Samba4-HOWTO/security=user.xml | 6 -
docs-xml/Samba4-HOWTO/shares.xml | 3 -
docs-xml/Samba4-HOWTO/smbclient.xml | 4 -
docs-xml/configure.ac | 4 +-
docs-xml/manpages-3/eventlogadm.8.xml | 291 ---
docs-xml/manpages-3/findsmb.1.xml | 153 --
docs-xml/manpages-3/idmap_ad.8.xml | 114 -
docs-xml/manpages-3/idmap_autorid.8.xml | 153 --
docs-xml/manpages-3/idmap_hash.8.xml | 75 -
docs-xml/manpages-3/idmap_ldap.8.xml | 145 --
docs-xml/manpages-3/idmap_nss.8.xml | 60 -
docs-xml/manpages-3/idmap_rid.8.xml | 132 --
docs-xml/manpages-3/idmap_tdb.8.xml | 75 -
docs-xml/manpages-3/idmap_tdb2.8.xml | 137 --
docs-xml/manpages-3/ldb.3.xml | 265 ---
docs-xml/manpages-3/ldbadd.1.xml | 108 -
docs-xml/manpages-3/ldbdel.1.xml | 108 -
docs-xml/manpages-3/ldbedit.1.xml | 203 --
docs-xml/manpages-3/ldbmodify.1.xml | 96 -
docs-xml/manpages-3/ldbrename.1.xml | 110 -
docs-xml/manpages-3/ldbsearch.1.xml | 122 -
docs-xml/manpages-3/libsmbclient.7.xml | 141 --
docs-xml/manpages-3/lmhosts.5.xml | 127 --
docs-xml/manpages-3/log2pcap.1.xml | 138 --
docs-xml/manpages-3/net.8.xml | 2394 --------------------
docs-xml/manpages-3/nmbd.8.xml | 294 ---
docs-xml/manpages-3/nmblookup.1.xml | 223 --
docs-xml/manpages-3/ntlm_auth.1.xml | 409 ----
docs-xml/manpages-3/pam_winbind.8.xml | 264 ---
docs-xml/manpages-3/pam_winbind.conf.5.xml | 190 --
docs-xml/manpages-3/pdbedit.8.xml | 547 -----
docs-xml/manpages-3/profiles.1.xml | 88 -
docs-xml/manpages-3/rpcclient.1.xml | 542 -----
docs-xml/manpages-3/samba.7.xml | 334 ---
docs-xml/manpages-3/sharesec.1.xml | 220 --
docs-xml/manpages-3/smb.conf.5.xml | 827 -------
docs-xml/manpages-3/smbcacls.1.xml | 265 ---
docs-xml/manpages-3/smbclient.1.xml | 1193 ----------
docs-xml/manpages-3/smbcontrol.1.xml | 330 ---
docs-xml/manpages-3/smbcquotas.1.xml | 183 --
docs-xml/manpages-3/smbd.8.xml | 445 ----
docs-xml/manpages-3/smbget.1.xml | 217 --
docs-xml/manpages-3/smbgetrc.5.xml | 116 -
docs-xml/manpages-3/smbpasswd.5.xml | 211 --
docs-xml/manpages-3/smbpasswd.8.xml | 431 ----
docs-xml/manpages-3/smbspool.8.xml | 133 --
docs-xml/manpages-3/smbstatus.1.xml | 158 --
docs-xml/manpages-3/smbta-util.8.xml | 119 -
docs-xml/manpages-3/smbtar.1.xml | 237 --
docs-xml/manpages-3/smbtree.1.xml | 96 -
docs-xml/manpages-3/swat.8.xml | 237 --
docs-xml/manpages-3/tdbbackup.8.xml | 136 --
docs-xml/manpages-3/tdbdump.8.xml | 61 -
docs-xml/manpages-3/tdbtool.8.xml | 243 --
docs-xml/manpages-3/testparm.1.xml | 202 --
docs-xml/manpages-3/vfs_acl_tdb.8.xml | 79 -
docs-xml/manpages-3/vfs_acl_xattr.8.xml | 83 -
docs-xml/manpages-3/vfs_aio_fork.8.xml | 86 -
docs-xml/manpages-3/vfs_aio_linux.8.xml | 115 -
docs-xml/manpages-3/vfs_aio_pthread.8.xml | 120 -
docs-xml/manpages-3/vfs_audit.8.xml | 122 -
docs-xml/manpages-3/vfs_cacheprime.8.xml | 110 -
docs-xml/manpages-3/vfs_cap.8.xml | 78 -
docs-xml/manpages-3/vfs_catia.8.xml | 73 -
docs-xml/manpages-3/vfs_commit.8.xml | 110 -
docs-xml/manpages-3/vfs_crossrename.8.xml | 116 -
docs-xml/manpages-3/vfs_default_quota.8.xml | 136 --
docs-xml/manpages-3/vfs_dirsort.8.xml | 69 -
docs-xml/manpages-3/vfs_extd_audit.8.xml | 68 -
docs-xml/manpages-3/vfs_fake_perms.8.xml | 73 -
docs-xml/manpages-3/vfs_fileid.8.xml | 112 -
docs-xml/manpages-3/vfs_full_audit.8.xml | 241 --
docs-xml/manpages-3/vfs_gpfs.8.xml | 443 ----
docs-xml/manpages-3/vfs_media_harmony.8.xml | 142 --
docs-xml/manpages-3/vfs_netatalk.8.xml | 77 -
docs-xml/manpages-3/vfs_notify_fam.8.xml | 70 -
docs-xml/manpages-3/vfs_prealloc.8.xml | 107 -
docs-xml/manpages-3/vfs_preopen.8.xml | 115 -
docs-xml/manpages-3/vfs_readahead.8.xml | 115 -
docs-xml/manpages-3/vfs_readonly.8.xml | 101 -
docs-xml/manpages-3/vfs_recycle.8.xml | 220 --
docs-xml/manpages-3/vfs_scannedonly.8.xml | 243 --
docs-xml/manpages-3/vfs_shadow_copy.8.xml | 121 -
docs-xml/manpages-3/vfs_shadow_copy2.8.xml | 211 --
docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 299 ---
docs-xml/manpages-3/vfs_streams_depot.8.xml | 78 -
docs-xml/manpages-3/vfs_streams_xattr.8.xml | 68 -
docs-xml/manpages-3/vfs_time_audit.8.xml | 101 -
docs-xml/manpages-3/vfs_tsmsm.8.xml | 135 --
docs-xml/manpages-3/vfs_xattr_tdb.8.xml | 69 -
docs-xml/manpages-3/vfstest.1.xml | 153 --
docs-xml/manpages-3/wbinfo.1.xml | 500 ----
docs-xml/manpages-3/winbind_krb5_locator.7.xml | 95 -
docs-xml/manpages-3/winbindd.8.xml | 497 ----
docs-xml/manpages/eventlogadm.8.xml | 291 +++
docs-xml/manpages/findsmb.1.xml | 153 ++
docs-xml/manpages/idmap_ad.8.xml | 112 +
docs-xml/manpages/idmap_autorid.8.xml | 153 ++
docs-xml/manpages/idmap_hash.8.xml | 75 +
docs-xml/manpages/idmap_ldap.8.xml | 145 ++
docs-xml/manpages/idmap_nss.8.xml | 60 +
docs-xml/manpages/idmap_rid.8.xml | 132 ++
docs-xml/manpages/idmap_tdb.8.xml | 75 +
docs-xml/manpages/idmap_tdb2.8.xml | 137 ++
docs-xml/manpages/libsmbclient.7.xml | 141 ++
docs-xml/manpages/lmhosts.5.xml | 127 ++
docs-xml/manpages/log2pcap.1.xml | 138 ++
docs-xml/manpages/net.8.xml | 2394 ++++++++++++++++++++
docs-xml/manpages/nmbd.8.xml | 294 +++
docs-xml/manpages/nmblookup.1.xml | 223 ++
docs-xml/manpages/ntlm_auth.1.xml | 409 ++++
docs-xml/manpages/pam_winbind.8.xml | 264 +++
docs-xml/manpages/pam_winbind.conf.5.xml | 190 ++
docs-xml/manpages/pdbedit.8.xml | 547 +++++
docs-xml/manpages/profiles.1.xml | 88 +
docs-xml/manpages/rpcclient.1.xml | 542 +++++
docs-xml/manpages/samba.7.xml | 334 +++
docs-xml/manpages/sharesec.1.xml | 220 ++
docs-xml/manpages/smb.conf.5.xml | 827 +++++++
docs-xml/manpages/smbcacls.1.xml | 265 +++
docs-xml/manpages/smbclient.1.xml | 1193 ++++++++++
docs-xml/manpages/smbcontrol.1.xml | 330 +++
docs-xml/manpages/smbcquotas.1.xml | 183 ++
docs-xml/manpages/smbd.8.xml | 445 ++++
docs-xml/manpages/smbget.1.xml | 217 ++
docs-xml/manpages/smbgetrc.5.xml | 116 +
docs-xml/manpages/smbpasswd.5.xml | 211 ++
docs-xml/manpages/smbpasswd.8.xml | 431 ++++
docs-xml/manpages/smbspool.8.xml | 133 ++
docs-xml/manpages/smbstatus.1.xml | 158 ++
docs-xml/manpages/smbta-util.8.xml | 119 +
docs-xml/manpages/smbtar.1.xml | 237 ++
docs-xml/manpages/smbtree.1.xml | 96 +
docs-xml/manpages/swat.8.xml | 237 ++
docs-xml/manpages/testparm.1.xml | 202 ++
docs-xml/manpages/vfs_acl_tdb.8.xml | 79 +
docs-xml/manpages/vfs_acl_xattr.8.xml | 83 +
docs-xml/manpages/vfs_aio_fork.8.xml | 86 +
docs-xml/manpages/vfs_aio_linux.8.xml | 115 +
docs-xml/manpages/vfs_aio_pthread.8.xml | 120 +
docs-xml/manpages/vfs_audit.8.xml | 122 +
docs-xml/manpages/vfs_cacheprime.8.xml | 110 +
docs-xml/manpages/vfs_cap.8.xml | 78 +
docs-xml/manpages/vfs_catia.8.xml | 73 +
docs-xml/manpages/vfs_commit.8.xml | 110 +
docs-xml/manpages/vfs_crossrename.8.xml | 116 +
docs-xml/manpages/vfs_default_quota.8.xml | 136 ++
docs-xml/manpages/vfs_dirsort.8.xml | 69 +
docs-xml/manpages/vfs_extd_audit.8.xml | 68 +
docs-xml/manpages/vfs_fake_perms.8.xml | 73 +
docs-xml/manpages/vfs_fileid.8.xml | 112 +
docs-xml/manpages/vfs_full_audit.8.xml | 241 ++
docs-xml/manpages/vfs_gpfs.8.xml | 443 ++++
docs-xml/manpages/vfs_media_harmony.8.xml | 142 ++
docs-xml/manpages/vfs_netatalk.8.xml | 77 +
docs-xml/manpages/vfs_notify_fam.8.xml | 70 +
docs-xml/manpages/vfs_prealloc.8.xml | 107 +
docs-xml/manpages/vfs_preopen.8.xml | 115 +
docs-xml/manpages/vfs_readahead.8.xml | 115 +
docs-xml/manpages/vfs_readonly.8.xml | 101 +
docs-xml/manpages/vfs_recycle.8.xml | 220 ++
docs-xml/manpages/vfs_scannedonly.8.xml | 243 ++
docs-xml/manpages/vfs_shadow_copy.8.xml | 121 +
docs-xml/manpages/vfs_shadow_copy2.8.xml | 211 ++
docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml | 299 +++
docs-xml/manpages/vfs_streams_depot.8.xml | 78 +
docs-xml/manpages/vfs_streams_xattr.8.xml | 68 +
docs-xml/manpages/vfs_time_audit.8.xml | 101 +
docs-xml/manpages/vfs_tsmsm.8.xml | 135 ++
docs-xml/manpages/vfs_xattr_tdb.8.xml | 69 +
docs-xml/manpages/vfstest.1.xml | 153 ++
docs-xml/manpages/wbinfo.1.xml | 500 ++++
docs-xml/manpages/winbind_krb5_locator.7.xml | 95 +
docs-xml/manpages/winbindd.8.xml | 497 ++++
docs-xml/scripts/find_missing_doc.pl | 2 +-
docs-xml/scripts/find_missing_manpages.pl | 2 +-
docs-xml/smbdotconf/base/displaycharset.xml | 17 -
docs-xml/smbdotconf/locking/kernelsharemodes.xml | 31 +
docs-xml/smbdotconf/logon/adduserscript.xml | 8 -
docs-xml/smbdotconf/printing/printing.xml | 6 +-
docs-xml/smbdotconf/protocol/durablehandles.xml | 27 +
docs-xml/smbdotconf/protocol/servermaxprotocol.xml | 2 +-
docs-xml/smbdotconf/security/adminusers.xml | 3 -
docs-xml/smbdotconf/security/encryptpasswords.xml | 2 +-
docs-xml/smbdotconf/security/maptoguest.xml | 18 +-
docs-xml/smbdotconf/security/passwordserver.xml | 55 +-
docs-xml/smbdotconf/security/readlist.xml | 4 -
docs-xml/smbdotconf/security/security.xml | 2 +-
docs-xml/smbdotconf/security/usernamemap.xml | 6 +-
docs-xml/smbdotconf/security/writelist.xml | 5 -
.../smbdotconf/tuning/paranoidserversecurity.xml | 19 -
docs-xml/smbdotconf/vfs/getquotacommand.xml | 30 +-
docs-xml/smbdotconf/vfs/setquotacommand.xml | 24 +-
docs-xml/wscript_build | 90 +
examples/VFS/skel_opaque.c | 15 +
examples/VFS/skel_transparent.c | 18 +
file_server/file_server.c | 19 +-
howto4.txt | 7 -
lib/krb5_wrap/krb5_samba.c | 2 +-
lib/ldb/common/ldb_parse.c | 11 +-
lib/param/loadparm.c | 7 +-
lib/param/param_functions.c | 4 +-
lib/param/param_table.c | 42 +-
lib/replace/libreplace_cc.m4 | 1 +
lib/replace/replace.h | 2 +-
lib/replace/wscript | 3 +-
lib/util/wscript_configure | 12 +
libcli/nbt/man/nmblookup.1.xml | 213 --
libcli/nbt/man/nmblookup4.1.xml | 213 ++
libcli/nbt/wscript_build | 2 +-
libcli/security/access_check.c | 86 +-
libcli/security/access_check.h | 11 +
librpc/idl/dns.idl | 14 +
librpc/idl/security.idl | 15 +-
librpc/idl/smb_acl.idl | 25 +-
merged-branches.txt | 6 -
nsswitch/pam_winbind.c | 2 +-
release-scripts/build-htmlman-git | 2 +-
release-scripts/build-htmlman-nogit | 2 +-
release-scripts/build-manpages-git | 8 +-
release-scripts/build-manpages-nogit | 8 +-
selftest/knownfail | 14 +-
selftest/target/Samba3.pm | 6 +-
selftest/target/Samba4.pm | 75 +-
source3/Makefile.in | 3 +-
source3/autogen.sh | 25 +-
source3/client/client.c | 3 +-
source3/configure.in | 235 +--
source3/include/ads.h | 1 +
source3/include/passdb.h | 11 +
source3/include/proto.h | 4 +-
source3/include/smb_acls.h | 2 +-
source3/include/smbldap.h | 8 +-
source3/include/vfs.h | 61 +-
source3/include/vfs_macros.h | 35 +
source3/lib/ABI/smbldap-0.sigs | 28 +
source3/lib/cbuf.h | 5 -
source3/lib/dbwrap/dbwrap_ctdb.c | 9 +-
source3/lib/dbwrap/dbwrap_watch.h | 2 +-
source3/lib/sharesec.c | 2 +-
source3/lib/smbldap.c | 14 +-
source3/lib/srprs.c | 5 +-
source3/lib/srprs.h | 3 -
source3/lib/sysacls.c | 37 +-
source3/lib/sysquotas.c | 11 +-
source3/lib/sysquotas_4B.c | 238 ++
source3/lib/sysquotas_nfs.c | 60 +-
source3/lib/sysquotas_xfs.c | 21 +-
source3/lib/system.c | 27 +-
source3/lib/util_tdb.c | 3 +
source3/libads/ads_struct.c | 1 +
source3/libads/kerberos_util.c | 8 +-
source3/libads/ldap.c | 2 +-
source3/libads/sasl.c | 92 +-
source3/librpc/idl/open_files.idl | 16 +
source3/librpc/idl/smbXsrv.idl | 8 +
source3/libsmb/cliconnect.c | 2 +-
source3/libsmb/clispnego.c | 4 +-
source3/libsmb/pylibsmb.c | 4 +-
source3/locking/brlock.c | 127 +-
source3/locking/locking.c | 38 +
source3/locking/proto.h | 4 +
source3/locking/share_mode_lock.c | 2 +-
source3/m4/autoconf-2.60.m4 | 236 ++
source3/modules/vfs_acl_common.c | 10 +
source3/modules/vfs_aio_fork.c | 6 +-
source3/modules/vfs_aixacl_util.c | 4 +-
source3/modules/vfs_default.c | 38 +-
source3/modules/vfs_fake_acls.c | 68 +
source3/modules/vfs_full_audit.c | 37 +
source3/modules/vfs_media_harmony.c | 388 ++--
source3/modules/vfs_netatalk.c | 14 +-
source3/modules/vfs_posixacl.c | 10 +-
source3/modules/vfs_preopen.c | 2 +-
source3/modules/vfs_smb_traffic_analyzer.c | 2 +-
source3/modules/vfs_streams_depot.c | 2 +-
source3/modules/vfs_time_audit.c | 299 ++-
source3/modules/wscript_build | 5 +-
source3/param/loadparm.c | 22 +-
source3/passdb/ABI/pdb-0.sigs | 306 +++
source3/passdb/lookup_sid.c | 8 +-
source3/passdb/machine_account_secrets.c | 4 +
source3/passdb/pdb_ipa.c | 14 +-
source3/passdb/pdb_ldap.c | 82 +-
source3/passdb/pdb_nds.c | 4 +-
source3/passdb/pdb_samba4.c | 2298 -------------------
source3/passdb/pdb_samba_dsdb.c | 2303 +++++++++++++++++++
source3/passdb/pdb_secrets.c | 34 +
source3/passdb/wscript_build | 8 +-
source3/rpc_server/rpc_server.h | 1 -
source3/selftest/tests.py | 5 +-
source3/smbd/close.c | 86 +-
source3/smbd/dfree.c | 7 +-
source3/smbd/durable.c | 569 +++++
source3/smbd/files.c | 11 +-
source3/smbd/globals.c | 1 -
source3/smbd/globals.h | 7 +-
source3/smbd/lanman.c | 6 +-
source3/smbd/noquotas.c | 38 -
source3/smbd/open.c | 240 ++-
source3/smbd/posix_acls.c | 6 +-
source3/smbd/proto.h | 35 +-
source3/smbd/pysmbd.c | 2 +-
source3/smbd/quotas.c | 1016 +--------
source3/smbd/sec_ctx.c | 2 +-
source3/smbd/service.c | 6 +
source3/smbd/smb2_create.c | 409 +++-
source3/smbd/smb2_sesssetup.c | 47 +-
source3/smbd/smbXsrv_open.c | 205 ++-
source3/smbd/vfs.c | 78 +-
source3/tests/sysquotas.c | 32 +-
source3/utils/net_sam.c | 10 +-
source3/utils/pdbedit.c | 2 +-
source3/utils/testparm.c | 2 -
source3/winbindd/idmap_ldap.c | 2 +-
source3/winbindd/winbindd_ads.c | 6 +-
source3/winbindd/winbindd_group.c | 10 +-
source3/wscript | 94 +-
source3/wscript_build | 41 +-
source4/dns_server/dns_crypto.c | 359 +++
source4/dns_server/dns_query.c | 233 ++
source4/dns_server/dns_server.c | 70 +-
source4/dns_server/dns_server.h | 36 +
source4/dns_server/dns_update.c | 91 +-
source4/dns_server/dns_utils.c | 2 +
source4/dns_server/wscript_build | 11 +-
source4/dsdb/common/util.c | 5 -
source4/kdc/kpasswdd.c | 8 +-
source4/libnet/libnet_lookup.c | 4 +-
source4/scripting/bin/samba-tool | 2 +-
source4/scripting/bin/samba_upgradedns | 34 +-
.../{upgradeprovision => samba_upgradeprovision} | 0
source4/scripting/bin/wscript_build | 2 +-
source4/scripting/python/samba/join.py | 25 +-
source4/scripting/python/samba/netcmd/__init__.py | 8 +
source4/scripting/python/samba/netcmd/domain.py | 320 +++-
source4/scripting/python/samba/netcmd/ntacl.py | 80 +-
source4/scripting/python/samba/netcmd/testparm.py | 5 -
source4/scripting/python/samba/ntacls.py | 2 +-
.../scripting/python/samba/provision/__init__.py | 64 +-
source4/scripting/python/samba/tests/dns.py | 38 +-
source4/scripting/python/samba/tests/posixacl.py | 76 +-
.../python/samba/tests/samba_tool/ntacl.py | 69 +-
source4/scripting/python/samba/upgrade.py | 1 +
source4/scripting/python/samba/upgradehelpers.py | 3 -
source4/scripting/wscript_build | 6 +-
source4/selftest/tests.py | 9 +-
source4/setup/provision | 267 ---
source4/setup/tests/blackbox_group.sh | 2 +-
source4/setup/tests/blackbox_newuser.sh | 2 +-
source4/setup/tests/blackbox_provision-backend.sh | 10 +-
source4/setup/tests/blackbox_provision.sh | 18 +-
source4/setup/tests/blackbox_setpassword.sh | 2 +-
source4/setup/tests/blackbox_upgradeprovision.sh | 8 +-
source4/setup/wscript_build | 6 -
source4/torture/basic/denytest.c | 31 +-
source4/torture/dns/dlz_bind9.c | 152 ++
source4/torture/dns/internal_dns.c | 190 ++
source4/torture/dns/wscript_build | 19 +
source4/torture/libnet/userman.c | 4 +-
source4/torture/raw/oplock.c | 78 +
source4/torture/rpc/samba3rpc.c | 123 +-
source4/torture/rpc/testjoin.c | 74 +
source4/torture/smb2/durable_open.c | 424 +++-
source4/torture/smb2/durable_v2_open.c | 185 ++
source4/torture/smb2/oplock.c | 15 +-
source4/torture/wscript_build | 1 +
source4/winbind/idmap.c | 2 +-
testprogs/blackbox/dbcheck-alpha13.sh | 34 +-
testprogs/blackbox/renamedc.sh | 2 +-
wintest/conf/abartlet.conf | 12 +-
wintest/test-s4-howto.py | 32 +-
wintest/wintest.py | 62 +-
wscript | 17 +-
wscript_build | 5 +
405 files changed, 28137 insertions(+), 25928 deletions(-)
create mode 100644 buildtools/wafsamba/configure_file.py
delete mode 100644 docs-xml/Samba4-HOWTO/ad-dc.xml
delete mode 100644 docs-xml/Samba4-HOWTO/ad-member.xml
delete mode 100644 docs-xml/Samba4-HOWTO/auth.xml
delete mode 100644 docs-xml/Samba4-HOWTO/cifsfs.xml
delete mode 100644 docs-xml/Samba4-HOWTO/compiling.xml
delete mode 100644 docs-xml/Samba4-HOWTO/config.xml
delete mode 100644 docs-xml/Samba4-HOWTO/domain-bdc.xml
delete mode 100644 docs-xml/Samba4-HOWTO/domain-member.xml
delete mode 100644 docs-xml/Samba4-HOWTO/domain-pdc.xml
delete mode 100644 docs-xml/Samba4-HOWTO/gui-clients.xml
delete mode 100644 docs-xml/Samba4-HOWTO/history.xml
delete mode 100644 docs-xml/Samba4-HOWTO/index.xml
delete mode 100644 docs-xml/Samba4-HOWTO/ldb.xml
delete mode 100644 docs-xml/Samba4-HOWTO/printing.xml
delete mode 100644 docs-xml/Samba4-HOWTO/protocol.xml
delete mode 100644 docs-xml/Samba4-HOWTO/registry.xml
delete mode 100644 docs-xml/Samba4-HOWTO/samba.xml
delete mode 100644 docs-xml/Samba4-HOWTO/security=share.xml
delete mode 100644 docs-xml/Samba4-HOWTO/security=user.xml
delete mode 100644 docs-xml/Samba4-HOWTO/shares.xml
delete mode 100644 docs-xml/Samba4-HOWTO/smbclient.xml
delete mode 100644 docs-xml/manpages-3/eventlogadm.8.xml
delete mode 100644 docs-xml/manpages-3/findsmb.1.xml
delete mode 100644 docs-xml/manpages-3/idmap_ad.8.xml
delete mode 100644 docs-xml/manpages-3/idmap_autorid.8.xml
delete mode 100644 docs-xml/manpages-3/idmap_hash.8.xml
delete mode 100644 docs-xml/manpages-3/idmap_ldap.8.xml
delete mode 100644 docs-xml/manpages-3/idmap_nss.8.xml
delete mode 100644 docs-xml/manpages-3/idmap_rid.8.xml
delete mode 100644 docs-xml/manpages-3/idmap_tdb.8.xml
delete mode 100644 docs-xml/manpages-3/idmap_tdb2.8.xml
delete mode 100644 docs-xml/manpages-3/ldb.3.xml
delete mode 100644 docs-xml/manpages-3/ldbadd.1.xml
delete mode 100644 docs-xml/manpages-3/ldbdel.1.xml
delete mode 100644 docs-xml/manpages-3/ldbedit.1.xml
delete mode 100644 docs-xml/manpages-3/ldbmodify.1.xml
delete mode 100644 docs-xml/manpages-3/ldbrename.1.xml
delete mode 100644 docs-xml/manpages-3/ldbsearch.1.xml
delete mode 100644 docs-xml/manpages-3/libsmbclient.7.xml
delete mode 100644 docs-xml/manpages-3/lmhosts.5.xml
delete mode 100644 docs-xml/manpages-3/log2pcap.1.xml
delete mode 100644 docs-xml/manpages-3/net.8.xml
delete mode 100644 docs-xml/manpages-3/nmbd.8.xml
delete mode 100644 docs-xml/manpages-3/nmblookup.1.xml
delete mode 100644 docs-xml/manpages-3/ntlm_auth.1.xml
delete mode 100644 docs-xml/manpages-3/pam_winbind.8.xml
delete mode 100644 docs-xml/manpages-3/pam_winbind.conf.5.xml
delete mode 100644 docs-xml/manpages-3/pdbedit.8.xml
delete mode 100644 docs-xml/manpages-3/profiles.1.xml
delete mode 100644 docs-xml/manpages-3/rpcclient.1.xml
delete mode 100644 docs-xml/manpages-3/samba.7.xml
delete mode 100644 docs-xml/manpages-3/sharesec.1.xml
delete mode 100644 docs-xml/manpages-3/smb.conf.5.xml
delete mode 100644 docs-xml/manpages-3/smbcacls.1.xml
delete mode 100644 docs-xml/manpages-3/smbclient.1.xml
delete mode 100644 docs-xml/manpages-3/smbcontrol.1.xml
delete mode 100644 docs-xml/manpages-3/smbcquotas.1.xml
delete mode 100644 docs-xml/manpages-3/smbd.8.xml
delete mode 100644 docs-xml/manpages-3/smbget.1.xml
delete mode 100644 docs-xml/manpages-3/smbgetrc.5.xml
delete mode 100644 docs-xml/manpages-3/smbpasswd.5.xml
delete mode 100644 docs-xml/manpages-3/smbpasswd.8.xml
delete mode 100644 docs-xml/manpages-3/smbspool.8.xml
delete mode 100644 docs-xml/manpages-3/smbstatus.1.xml
delete mode 100644 docs-xml/manpages-3/smbta-util.8.xml
delete mode 100644 docs-xml/manpages-3/smbtar.1.xml
delete mode 100644 docs-xml/manpages-3/smbtree.1.xml
delete mode 100644 docs-xml/manpages-3/swat.8.xml
delete mode 100644 docs-xml/manpages-3/tdbbackup.8.xml
delete mode 100644 docs-xml/manpages-3/tdbdump.8.xml
delete mode 100644 docs-xml/manpages-3/tdbtool.8.xml
delete mode 100644 docs-xml/manpages-3/testparm.1.xml
delete mode 100644 docs-xml/manpages-3/vfs_acl_tdb.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_acl_xattr.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_aio_fork.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_aio_linux.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_aio_pthread.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_audit.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_cacheprime.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_cap.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_catia.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_commit.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_crossrename.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_default_quota.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_dirsort.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_extd_audit.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_fake_perms.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_fileid.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_full_audit.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_gpfs.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_media_harmony.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_netatalk.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_notify_fam.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_prealloc.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_preopen.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_readahead.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_readonly.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_recycle.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_scannedonly.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_shadow_copy.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_shadow_copy2.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_streams_depot.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_streams_xattr.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_time_audit.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_tsmsm.8.xml
delete mode 100644 docs-xml/manpages-3/vfs_xattr_tdb.8.xml
delete mode 100644 docs-xml/manpages-3/vfstest.1.xml
delete mode 100644 docs-xml/manpages-3/wbinfo.1.xml
delete mode 100644 docs-xml/manpages-3/winbind_krb5_locator.7.xml
delete mode 100644 docs-xml/manpages-3/winbindd.8.xml
create mode 100644 docs-xml/manpages/eventlogadm.8.xml
create mode 100644 docs-xml/manpages/findsmb.1.xml
create mode 100644 docs-xml/manpages/idmap_ad.8.xml
create mode 100644 docs-xml/manpages/idmap_autorid.8.xml
create mode 100644 docs-xml/manpages/idmap_hash.8.xml
create mode 100644 docs-xml/manpages/idmap_ldap.8.xml
create mode 100644 docs-xml/manpages/idmap_nss.8.xml
create mode 100644 docs-xml/manpages/idmap_rid.8.xml
create mode 100644 docs-xml/manpages/idmap_tdb.8.xml
create mode 100644 docs-xml/manpages/idmap_tdb2.8.xml
create mode 100644 docs-xml/manpages/libsmbclient.7.xml
create mode 100644 docs-xml/manpages/lmhosts.5.xml
create mode 100644 docs-xml/manpages/log2pcap.1.xml
create mode 100644 docs-xml/manpages/net.8.xml
create mode 100644 docs-xml/manpages/nmbd.8.xml
create mode 100644 docs-xml/manpages/nmblookup.1.xml
create mode 100644 docs-xml/manpages/ntlm_auth.1.xml
create mode 100644 docs-xml/manpages/pam_winbind.8.xml
create mode 100644 docs-xml/manpages/pam_winbind.conf.5.xml
create mode 100644 docs-xml/manpages/pdbedit.8.xml
create mode 100644 docs-xml/manpages/profiles.1.xml
create mode 100644 docs-xml/manpages/rpcclient.1.xml
create mode 100644 docs-xml/manpages/samba.7.xml
create mode 100644 docs-xml/manpages/sharesec.1.xml
create mode 100644 docs-xml/manpages/smb.conf.5.xml
create mode 100644 docs-xml/manpages/smbcacls.1.xml
create mode 100644 docs-xml/manpages/smbclient.1.xml
create mode 100644 docs-xml/manpages/smbcontrol.1.xml
create mode 100644 docs-xml/manpages/smbcquotas.1.xml
create mode 100644 docs-xml/manpages/smbd.8.xml
create mode 100644 docs-xml/manpages/smbget.1.xml
create mode 100644 docs-xml/manpages/smbgetrc.5.xml
create mode 100644 docs-xml/manpages/smbpasswd.5.xml
create mode 100644 docs-xml/manpages/smbpasswd.8.xml
create mode 100644 docs-xml/manpages/smbspool.8.xml
create mode 100644 docs-xml/manpages/smbstatus.1.xml
create mode 100644 docs-xml/manpages/smbta-util.8.xml
create mode 100644 docs-xml/manpages/smbtar.1.xml
create mode 100644 docs-xml/manpages/smbtree.1.xml
create mode 100644 docs-xml/manpages/swat.8.xml
create mode 100644 docs-xml/manpages/testparm.1.xml
create mode 100644 docs-xml/manpages/vfs_acl_tdb.8.xml
create mode 100644 docs-xml/manpages/vfs_acl_xattr.8.xml
create mode 100644 docs-xml/manpages/vfs_aio_fork.8.xml
create mode 100644 docs-xml/manpages/vfs_aio_linux.8.xml
create mode 100644 docs-xml/manpages/vfs_aio_pthread.8.xml
create mode 100644 docs-xml/manpages/vfs_audit.8.xml
create mode 100644 docs-xml/manpages/vfs_cacheprime.8.xml
create mode 100644 docs-xml/manpages/vfs_cap.8.xml
create mode 100644 docs-xml/manpages/vfs_catia.8.xml
create mode 100644 docs-xml/manpages/vfs_commit.8.xml
create mode 100644 docs-xml/manpages/vfs_crossrename.8.xml
create mode 100644 docs-xml/manpages/vfs_default_quota.8.xml
create mode 100644 docs-xml/manpages/vfs_dirsort.8.xml
create mode 100644 docs-xml/manpages/vfs_extd_audit.8.xml
create mode 100644 docs-xml/manpages/vfs_fake_perms.8.xml
create mode 100644 docs-xml/manpages/vfs_fileid.8.xml
create mode 100644 docs-xml/manpages/vfs_full_audit.8.xml
create mode 100644 docs-xml/manpages/vfs_gpfs.8.xml
create mode 100644 docs-xml/manpages/vfs_media_harmony.8.xml
create mode 100644 docs-xml/manpages/vfs_netatalk.8.xml
create mode 100644 docs-xml/manpages/vfs_notify_fam.8.xml
create mode 100644 docs-xml/manpages/vfs_prealloc.8.xml
create mode 100644 docs-xml/manpages/vfs_preopen.8.xml
create mode 100644 docs-xml/manpages/vfs_readahead.8.xml
create mode 100644 docs-xml/manpages/vfs_readonly.8.xml
create mode 100644 docs-xml/manpages/vfs_recycle.8.xml
create mode 100644 docs-xml/manpages/vfs_scannedonly.8.xml
create mode 100644 docs-xml/manpages/vfs_shadow_copy.8.xml
create mode 100644 docs-xml/manpages/vfs_shadow_copy2.8.xml
create mode 100644 docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml
create mode 100644 docs-xml/manpages/vfs_streams_depot.8.xml
create mode 100644 docs-xml/manpages/vfs_streams_xattr.8.xml
create mode 100644 docs-xml/manpages/vfs_time_audit.8.xml
create mode 100644 docs-xml/manpages/vfs_tsmsm.8.xml
create mode 100644 docs-xml/manpages/vfs_xattr_tdb.8.xml
create mode 100644 docs-xml/manpages/vfstest.1.xml
create mode 100644 docs-xml/manpages/wbinfo.1.xml
create mode 100644 docs-xml/manpages/winbind_krb5_locator.7.xml
create mode 100644 docs-xml/manpages/winbindd.8.xml
delete mode 100644 docs-xml/smbdotconf/base/displaycharset.xml
create mode 100644 docs-xml/smbdotconf/locking/kernelsharemodes.xml
create mode 100644 docs-xml/smbdotconf/protocol/durablehandles.xml
delete mode 100644 docs-xml/smbdotconf/tuning/paranoidserversecurity.xml
create mode 100644 docs-xml/wscript_build
delete mode 100644 howto4.txt
delete mode 100644 libcli/nbt/man/nmblookup.1.xml
create mode 100644 libcli/nbt/man/nmblookup4.1.xml
delete mode 100644 merged-branches.txt
create mode 100644 source3/lib/ABI/smbldap-0.sigs
create mode 100644 source3/lib/sysquotas_4B.c
create mode 100644 source3/m4/autoconf-2.60.m4
create mode 100644 source3/passdb/ABI/pdb-0.sigs
delete mode 100644 source3/passdb/pdb_samba4.c
create mode 100644 source3/passdb/pdb_samba_dsdb.c
create mode 100644 source3/smbd/durable.c
delete mode 100644 source3/smbd/noquotas.c
mode change 100755 => 100644 source3/wscript
create mode 100644 source4/dns_server/dns_crypto.c
rename source4/scripting/bin/{upgradeprovision => samba_upgradeprovision} (100%)
delete mode 100755 source4/setup/provision
create mode 100644 source4/torture/dns/dlz_bind9.c
create mode 100644 source4/torture/dns/internal_dns.c
create mode 100644 source4/torture/dns/wscript_build
Changeset truncated at 500 lines:
diff --git a/README b/README
index 6c842c3..6fc98e6 100644
--- a/README
+++ b/README
@@ -1,13 +1,18 @@
This is the release version of Samba, the free SMB and CIFS client and
-server for UNIX and other operating systems. Samba is maintained by
-the Samba Team, who support the original author, Andrew Tridgell.
+server and Domain Controller for UNIX and other operating
+systems. Samba is maintained by the Samba Team, who support the
+original author, Andrew Tridgell.
>>>> Please read THE WHOLE of this file as it gives important information
>>>> about the configuration and use of Samba.
-NOTE: Installation instructions may be found in
+NOTE: Installation instructions may be found
+ for the file/print server and domain member in:
docs/htmldocs/Samba3-HOWTO/install.html
+ For the AD DC implementation a full HOWTO is provided at:
+ http://wiki.samba.org/index.php/Samba4/HOWTO
+
This software is freely distributable under the GNU public license, a
copy of which you should have received with this software (in a file
called COPYING).
diff --git a/Roadmap b/Roadmap
index 975ca7b..8f664ec 100644
--- a/Roadmap
+++ b/Roadmap
@@ -9,15 +9,15 @@ information.
The following development objectives for future releases
are in progress:
----------------------------------------------------------------------------
-Samba-3.0.x This release turned into maintenance mode since we
- released 3.2.
+Samba-3.5.x This release turned into maintenance mode since we
+ released 3.6.
Samba-3.6.x This is the current stable Samba 3 release intended
for all Samba production server.
Samba-4.0 Our next release including the AD domain controller
- feature, and the file server and other functionality
- from Samba 3.6.
+ feature, the file server and other functionality
+ from Samba 3.6 as well as the new SMB3 protocol.
Note that it is a given that the Samba-Team will continue to track
diff --git a/VERSION b/VERSION
index 8dbd87b..642809e 100644
--- a/VERSION
+++ b/VERSION
@@ -67,7 +67,7 @@ SAMBA_VERSION_ALPHA_RELEASE=
# e.g. SAMBA_VERSION_BETA_RELEASE=1 #
# -> "4.0.0beta1" #
########################################################
-SAMBA_VERSION_BETA_RELEASE=8
+SAMBA_VERSION_BETA_RELEASE=
########################################################
# For 'pre' releases the version will be #
@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=
+SAMBA_VERSION_RC_RELEASE=1
########################################################
# To mark SVN snapshots this should be set to 'yes' #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 4b1f0fe..b594e0e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,4 @@
-What's new in Samba 4.0 beta8
+What's new in Samba 4.0.0 rc1
=============================
Samba 4.0 will be the next version of the Samba suite and incorporates
@@ -11,7 +11,7 @@ and above.
WARNINGS
========
-Samba 4.0 beta8 is not a final Samba release, however we are now making
+Samba 4.0.0 rc1 is not a final Samba release, however we are now making
good progress towards a Samba 4.0 release. However, this is expected to be the
last beta release before we start on our release candidate series.
@@ -49,10 +49,14 @@ with those matching the GPOs in LDAP and the defaults from an initial
provision. This will set an underlying POSIX ACL if required (eg not
using the NTVFS file server).
+If you used the BIND9_FLATFILE or BIND9_DLZ features,
+you'll have to add '-dns' to the 'server services' option,
+as the internal dns server (SAMBA_INTERNAL) is the default now.
+
NEW FEATURES
============
-Samba 4.0 beta supports the server-side of the Active Directory logon
+Samba 4.0 supports the server-side of the Active Directory logon
environment used by Windows 2000 and later, so we can do full domain
join and domain logon operations with these clients.
@@ -80,13 +84,14 @@ running an AD DC, you only need to run 'samba' (not
nmbd/smbd/winbind), as the required services are co-coordinated by this
master binary.
-As DNS is an integral part of Active Directory, we also provide a DNS
-solution, using the BIND DLZ mechanism in versions 9.8 and 9.9.
-During the provision, a configuration file will be generated for bind
-to make it use this plugin. We also have a project to provide a
-minimal internal DNS server from within the Samba process, for easier
-'out of the box' configuration. Note however that this is not yet
-complete (pending addition of secure DNS update support).
+As DNS is an integral part of Active Directory, we also provide two DNS
+solutions, a simple internal DNS server for 'out of the box' configurations
+and a more elaborate BIND plugin using the BIND DLZ mechanism in versions
+9.8 and 9.9. During the provision, you can select which backend to use.
+With the internal backend, your DNS server is good to go.
+If you chose the BIND_DLZ backend, a configuration file will be generated
+for bind to make it use this plugin, as well as a file explaining how to
+set up bind.
To provide accurate timestamps to Windows clients, we integrate with
the NTP project to provide secured NTP replies. To use you need to
@@ -97,35 +102,53 @@ Finally, a new scripting interface has been added to Samba 4, allowing
Python programs to interface to Samba's internals, and many tools and
internal workings of the DC code is now implemented in python.
+CHANGES SINCE beta8
+===================
-CHANGES SINCE beta7
-=====================
-
-For a list of changes since beta7, please see the git log.
+For a list of changes since beta8, please see the git log.
$ git clone git://git.samba.org/samba.git
$ cd samba.git
-$ git log samba-4.0.0beta7..samba-4.0.0beta8
+$ git log samba-4.0.0beta8..samba-4.0.0rc1
Some major user-visible changes include:
-- A fix for a segfault/abort on startup of the 'samba' binary in the
- credentials_secrets code.
-
-- A fix for samba-tool classicupgrade of pdb_ldap-based domains
-
-- A fix for samba-tool domain exportkeyab only exporting DES keys
-
-- Printing is now enabled on the AD DC
-
-- Fix bug #9124 - Samba fails to set "inherited" bit on inherited ACE's.
-
-- We now avoid printing secret attributes (such as unicodePwd and
- suppliementalCredentials) in ldb trace logs
-
-- s3-printing: fix bug 9123 lprng job tracking errors
-
-- A fix for building with MIT Kerberos
+- The smbd file server now offers SMB3 as the maximum protocol
+ by default. Samba can negotiate version 3 of the SMB protocol
+ and supports the required features, including all required
+ features of SMB 2.1 and SMB 2.0. Note that this does not imply
+ that Samba implements all features of SMB3 since many of them
+ are optional capabilities. Examples of features that Samba does
+ not implement yet are leases (SMB 2.1) and multi-channel (SMB 3).
+
+ Samba now offers an initial support for SMB2 durable file handles.
+ These are enabled by default and can be turned off on a per share
+ basis by setting "durable handles = no" on the share configuration.
+ Note that in order to prevent conflicts with other applications
+ accessing the same files, durable handles are only granted on
+ shares that are configured for CIFS/SMB2-only access, i.e. more
+ explicitly shares that are configured for minimal interoperability
+ with these settings:
+
+ kernel oplocks = no
+ kernel share modes = no
+ posix locking = no
+
+ The option "kernel share modes" has been introduced to be able
+ to turn the translation of SMB share modes into kernel flocks
+ off.
+
+- The 'provision' script was merged into 'samba-tool'
+ as 'samba-tool domain provision' the arguments are still
+ the same.
+
+- The 'updateprovision' script was renamed to 'samba_upgradeprovision'.
+
+- We changed the default dns implementation to the internal dns server
+ (SAMBA_INTERNAL). BIND9_FLATFILE and BIND9_DLZ are still available,
+ but you'll have to add '-dns' to the 'server services' option
+ to disable the internal dns server.
+ The default for 'allow dns updates' has changed to 'secure only'.
KNOWN ISSUES
============
@@ -158,7 +181,7 @@ KNOWN ISSUES
- Replication may fail on FreeBSD due to getaddrinfo() rejecting names
containing _. A workaround will be in a future beta.
-- upgradeprovision should not be run when upgrading to this release
+- samba_upgradeprovision should not be run when upgrading to this release
from a recent release. No important database format changes have
been made since alpha16.
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c
index 05f0a62..e636123 100644
--- a/auth/credentials/credentials.c
+++ b/auth/credentials/credentials.c
@@ -371,6 +371,10 @@ _PUBLIC_ bool cli_credentials_set_password(struct cli_credentials *cred,
{
if (obtained >= cred->password_obtained) {
cred->password = talloc_strdup(cred, val);
+ if (cred->password) {
+ /* Don't print the actual password in talloc memory dumps */
+ talloc_set_name_const(cred->password, "password set via cli_credentials_set_password");
+ }
cred->password_obtained = obtained;
cli_credentials_invalidate_ccache(cred, cred->password_obtained);
@@ -416,6 +420,10 @@ _PUBLIC_ bool cli_credentials_set_old_password(struct cli_credentials *cred,
enum credentials_obtained obtained)
{
cred->old_password = talloc_strdup(cred, val);
+ if (cred->old_password) {
+ /* Don't print the actual password in talloc memory dumps */
+ talloc_set_name_const(cred->old_password, "password set via cli_credentials_set_old_password");
+ }
return true;
}
diff --git a/buildtools/scripts/abi_gen.sh b/buildtools/scripts/abi_gen.sh
index ed6f445..787718c 100755
--- a/buildtools/scripts/abi_gen.sh
+++ b/buildtools/scripts/abi_gen.sh
@@ -10,7 +10,7 @@ cat <<EOF
set height 0
set width 0
EOF
-nm "$SHAREDLIB" | cut -d' ' -f2- | egrep '^[BDGTRVWS]' | grep -v @ | cut -c3- | sort | while read s; do
+nm "$SHAREDLIB" | cut -d' ' -f2- | egrep '^[BDGTRVWS]' | grep -v @ | egrep -v ' (__bss_start|_edata|_init|_fini|_end)' | cut -c3- | sort | while read s; do
echo "echo $s: "
echo p $s
done
diff --git a/buildtools/wafsamba/configure_file.py b/buildtools/wafsamba/configure_file.py
new file mode 100644
index 0000000..8e2ba3b
--- /dev/null
+++ b/buildtools/wafsamba/configure_file.py
@@ -0,0 +1,44 @@
+# handle substitution of variables in .in files
+
+import Build, sys, Logs
+from samba_utils import *
+
+def subst_at_vars(task):
+ '''substiture @VAR@ style variables in a file'''
+
+ env = task.env
+ src = task.inputs[0].srcpath(env)
+ tgt = task.outputs[0].bldpath(env)
+
+ f = open(src, 'r')
+ s = f.read()
+ f.close()
+ # split on the vars
+ a = re.split('(@\w+@)', s)
+ out = []
+ for v in a:
+ if re.match('@\w+@', v):
+ vname = v[1:-1]
+ if not vname in task.env and vname.upper() in task.env:
+ vname = vname.upper()
+ if not vname in task.env:
+ Logs.error("Unknown substitution %s in %s" % (v, task.name))
+ sys.exit(1)
+ v = SUBST_VARS_RECURSIVE(task.env[vname], task.env)
+ out.append(v)
+ contents = ''.join(out)
+ f = open(tgt, 'w')
+ s = f.write(contents)
+ f.close()
+ return 0
+
+def CONFIGURE_FILE(bld, in_file, **kwargs):
+ '''configure file'''
+
+ base=os.path.basename(in_file)
+ t = bld.SAMBA_GENERATOR('INFILE_%s' % base,
+ rule = subst_at_vars,
+ source = in_file + '.in',
+ target = in_file,
+ vars = kwargs)
+Build.BuildContext.CONFIGURE_FILE = CONFIGURE_FILE
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index 2966d7c..f5cac8a 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -15,8 +15,9 @@ version_key = lambda x: map(int, x.split("."))
def normalise_signature(sig):
'''normalise a signature from gdb'''
sig = sig.strip()
- sig = re.sub('^\$[0-9]+\s=\s\{*', '', sig)
- sig = re.sub('\}(\s0x[0-9a-f]+\s<\w+>)?$', '', sig)
+ sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}$', r'\1', sig)
+ sig = re.sub('^\$[0-9]+\s=\s\{(.+)\}(\s0x[0-9a-f]+\s<\w+>)+$', r'\1', sig)
+ sig = re.sub('^\$[0-9]+\s=\s(0x[0-9a-f]+)\s?(<\w+>)?$', r'\1', sig)
sig = re.sub('0x[0-9a-f]+', '0xXXXX', sig)
sig = re.sub('", <incomplete sequence (\\\\[a-z0-9]+)>', r'\1"', sig)
@@ -181,10 +182,19 @@ def abi_write_vscript(vscript, libname, current_version, versions, symmap, abi_m
f.write("}%s;\n\n" % last_key)
last_key = " %s" % symver
f.write("%s {\n" % current_version)
+ local_abi = filter(lambda x: x[0] == '!', abi_match)
+ global_abi = filter(lambda x: x[0] != '!', abi_match)
f.write("\tglobal:\n")
- for x in abi_match:
- f.write("\t\t%s;\n" % x)
- if abi_match != ["*"]:
+ if len(global_abi) > 0:
+ for x in global_abi:
+ f.write("\t\t%s;\n" % x)
+ else:
+ f.write("\t\t*;\n")
+ if len(local_abi) > 0:
+ f.write("\tlocal:\n")
+ for x in local_abi:
+ f.write("\t\t%s;\n" % x[1:])
+ elif abi_match != ["*"]:
f.write("\tlocal: *;\n")
f.write("};\n")
f.close()
diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index 1f56f2e..82492e1 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -99,6 +99,42 @@ def vcs_dir_contents(path):
def dist(appname='',version=''):
+
+ def add_files_to_tarball(tar, srcdir, srcsubdir, dstdir, dstsubdir, blacklist, files):
+ if blacklist == None:
+ blacklist = []
+ for f in files:
+ abspath = os.path.join(srcdir, f)
+
+ if srcsubdir != '.':
+ f = f[len(srcsubdir)+1:]
+
+ # Remove files in the blacklist
+ if f in blacklist:
+ continue
+ blacklisted = False
+ # Remove directories in the blacklist
+ for d in blacklist:
+ if f.startswith(d):
+ blacklisted = True
+ if blacklisted:
+ continue
+ if os.path.isdir(abspath):
+ continue
+ if dstsubdir != '.':
+ f = dstsubdir + '/' + f
+ fname = dstdir + '/' + f
+ add_tarfile(tar, fname, abspath, srcsubdir)
+
+
+ def list_directory_files(abspath):
+ out_files = []
+ for root, dirs, files in os.walk(abspath):
+ for f in files:
+ out_files.append(os.path.join(root, f))
+ return out_files
+
+
if not isinstance(appname, str) or not appname:
# this copes with a mismatch in the calling arguments for dist()
appname = Utils.g_module.APPNAME
@@ -135,28 +171,7 @@ def dist(appname='',version=''):
except Exception, e:
Logs.error('unable to get contents of %s: %s' % (absdir, e))
sys.exit(1)
- for f in files:
- abspath = os.path.join(srcdir, f)
-
- if dir != '.':
- f = f[len(dir)+1:]
-
- # Remove files in the blacklist
- if f in blacklist:
- continue
- blacklisted = False
- # Remove directories in the blacklist
- for d in blacklist:
- if f.startswith(d):
- blacklisted = True
- if blacklisted:
- continue
- if os.path.isdir(abspath):
- continue
- if destdir != '.':
- f = destdir + '/' + f
- fname = dist_base + '/' + f
- add_tarfile(tar, fname, abspath, dir)
+ add_files_to_tarball(tar, srcdir, dir, dist_base, destdir, blacklist, files)
if dist_files:
for file in dist_files.split():
@@ -168,11 +183,14 @@ def dist(appname='',version=''):
absfile = os.path.join(srcdir, file)
- if destfile != file:
- file = destfile
-
- fname = dist_base + '/' + file
- add_tarfile(tar, fname, absfile, file)
+ if os.path.isdir(absfile):
+ destdir = destfile
+ dir = file
+ files = list_directory_files(dir)
+ add_files_to_tarball(tar, srcdir, dir, dist_base, destdir, blacklist, files)
+ else:
+ fname = dist_base + '/' + destfile
+ add_tarfile(tar, fname, absfile, destfile)
tar.close()
@@ -212,11 +230,13 @@ def DIST_DIRS(dirs):
dist_dirs = dirs
@conf
-def DIST_FILES(files):
+def DIST_FILES(files, extend=False):
'''set additional files for packaging, relative to top srcdir'''
global dist_files
if not dist_files:
dist_files = files
+ elif extend:
+ dist_files = dist_files + " " + files
@conf
def DIST_BLACKLIST(blacklist):
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index f1e7aff..1f71bd3 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -31,6 +31,7 @@ import samba_wildcard
import stale_files
import symbols
import pkgconfig
+import configure_file
# some systems have broken threading in python
if os.environ.get('WAF_NOTHREADS') == '1':
@@ -404,6 +405,7 @@ def SAMBA_MODULE(bld, modname, source,
subdir=None,
enabled=True,
pyembed=False,
+ manpages=None,
allow_undefined_symbols=False
):
'''define a Samba module.'''
@@ -469,6 +471,7 @@ def SAMBA_MODULE(bld, modname, source,
link_name=build_link_name,
install_path="${MODULESDIR}/%s" % subsystem,
pyembed=pyembed,
+ manpages=manpages,
allow_undefined_symbols=allow_undefined_symbols
)
@@ -577,6 +580,12 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
if not enabled:
return
+ dep_vars = []
+ if isinstance(vars, dict):
+ dep_vars = vars.keys()
+ elif isinstance(vars, list):
+ dep_vars = vars
+
bld.SET_BUILD_GROUP(group)
t = bld(
rule=rule,
@@ -587,7 +596,7 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
before='cc',
ext_out='.c',
samba_type='GENERATOR',
- dep_vars = [rule] + (vars or []),
--
Samba Shared Repository
More information about the samba-cvs
mailing list