[SCM] Samba Shared Repository - branch v4-0-test updated

Andrew Bartlett abartlet at samba.org
Wed Jun 20 02:32:25 MDT 2012


The branch, v4-0-test has been updated
       via  59fdc48 VERSION: Mark as the beta2 release
       via  ce81780 WHATNEW: Update for the beta2 release
       via  352dbdd s4-idmap: Add parameter 'idmap_ldb:use rfc2307' and correct implementation errors
       via  2b50e8c s4-provision: Remove --slapd-path option
       via  706a998 s4-provision: Remove last unused remenants of the 'sid generator' configuration
       via  7f498f8 Revert "s4-libcli: Remove unused finddcs_nbt"
       via  671f610 Fix unused variable warnings.
       via  028a7d9 Fix unused variable warnings.
       via  53cc8f8 Remove unused variables.
       via  06cf0a9 Remove unused variables and code.
       via  76e2f29 Fix more "set but not used" warnings.
       via  0dfd15c Fix a bunch of "set but not used" warnings.
       via  acc9302 s3: We can depend on pthreadpool now
       via  8b35a4d s3: Add a dummy implementation for the pthreadpool API
       via  818fd7e Remove unused code now we set the correct command codes.
       via  737acc7 Fix warning: variable ‘status’ set but not used.
       via  d1bcbd7 Fix warnings using %lu to print a 64-bit value (should by %llu).
       via  6cef2a61 Fix  warning: variable ‘in_start_time’ set but not used.
       via  9b212d8 Fix warning: variable ‘XX’ set but not used.
       via  e43b745 waf: Fix make etags
       via  6c74d96 selftest/flapping: mark samba4.nss.test using winbind as flakey
       via  e891505 Revert "s3-lib Remove unused sys_fcntl_long()"
       via  13cfe25 s3:rpc_server/lsasd: remove dependency to libgen.h and basename()
       via  4f15b47 s3-auth: make_new_system_info_session() now does not query nss
       via  5c67599 s3-auth: make_new_system_info_session() not query passdb
       via  8ecee11 s3-auth: inline make_session_info functions into only callers
       via  e49656e auth: Use only security_token_is_system to determine that a user is SYSTEM
       via  873ec60 s3-auth: Fix system token as just being SID_NT_SYSTEM
       via  faf24ed s3-spoolss: delete_drivers should be called as the connecting user.
       via  7e80b89 ntdb: add autoconf support.
       via  1fe797a ntdb: put it back into the build.
       via  13ac664 libcli: use tdb directly, not tdb_compat.
       via  316e5e3 lib/tdb_wrap: use tdb directly, not tdb_compat.
       via  df4a6e8 ldb: use tdb directly, not tdb_compat.
       via  6dc02e8 lib/dbwrap: depend directly on tdb, not tdb_compat.
       via  2fc3265 lib/util_tdb: depend directly on tdb, not tdb_compat.
       via  5ff92d8 ntdb: update documentation.
       via  b888bc4 ntdb: optimize ntdb_fetch.
       via  8fdd20b ntdb: add -h arg to ntdbrestore
       via  a941b19 ntdb: reduce default hashsize on ntdbtorture.
       via  87f871a ntdb: add NTDB_ATTRIBUTE_HASHSIZE
       via  dd42962 ntdb: remove hash table trees.
       via  f986554 ntdb: special accessor functions for read/write of an offset.
       via  9133a98 ntdb: inline oob check
       via  d938c0b ntdb: allocator attribute.
       via  6d5a3e1 ntdb: still prepare recovery area with NTDB_NOSYNC.
       via  89b0d5a ntdb: simply disallow NULL names.
       via  7fae6c4 ntdb: reduce transaction pagesize from 64k to 16k.
       via  35381ca ntdb: remove last block transactoin logic.
       via  db25088 ntdb: create initial database to be multiple of NTDB_PGSIZE.
       via  9396757 ntdb: make sure file is always a multiple of PAGESIZE (now NTDB_PGSIZE)
       via  dd4eed4 ntdb: fix recovery data write.
       via  40cf088 ntdb: enhance external-helper test code.
       via  3bccb61 ntdb: use NTDB_LOG_WARNING level for failed open() without O_CREAT.
       via  c727362 ccan: remove bogus debug print.
       via  8a7c535 ntdb: make fork test more thorough.
       via  d48f6f8 ntdb: print 
 at end of log messages in tests.
       via  5027f9c ntdb: reduce race between creating file and getting open lock.
       via  1765c0f ntdb: catch any valgrind errors in test
       via  fc9b8ee ntdb: catch any valgrind errors in test
       via  f5e9ed1 ntdb: remove ntdb_error()
       via  16cc345 TDB2: Goodbye TDB2, Hello NTDB.
       via  76758b9 tdb2: Fix typo in TDB1_porting.txt
       via  c3dcdf0 TDB2: more internal cleanups after TDB1 compatibility removal.
       via  cab6e11 TDB2: remove TDB1 compatibility.
       via  6244f66 TDB2: make SAMBA use tdb1 again for the moment.
       via  5bad913 ccan: check for err.h ourselves
       via  85b8439 WHATSNEW: Fix typo.
       via  bf5934c tdb/wscript: Remove unecessary semicolons.
       via  59daf91 wafsamba/irixcc: add '-c99' option to cc
       via  26e868b Revert "s3: temporary hack to make the waf build work withouth autotools being required"
       via  63c2784 selftest/flapping: samba4.nss.test is also flakey for s3member
       via  333cee7 s3:autoconf: add -Iautoconf -Iautoconf/source3 at configure stage
       via  a146f07 s3:Makefile.in: remove pidl generated files with 'make realdistclean'
       via  9cbea1f s3:Makefile.in: fix 'make realdistclean' after moving generated files to autoconf/
       via  071dfb4 s3:Makefile.in: fix 'make clean' after moving generated files to autoconf/
       via  9522e85 s3:autogen.sh: fix autoconf/lib/param/param_proto.h location
       via  da76cda lib/param: add missing prototype of lpcfg_parm_long()
       via  d4912ed s3:autoconf-build: build the idmap backends tdb2, rid, and hash by default (shared)
       via  f5b40b1 s3:waf-build: build the idmap backends tdb2, rid, and hash by default (shared)
       via  39b4733 s3:idmap_tdb: fix miss in rename of dbwrap_trans_store_uint32() to dbwrap_trans_store_uint32_bystring()
       via  bb96139 dbwrap: Rename dbwrap_fetch_uint32->dbwrap_fetch_uint32_bystring
       via  ad3881b s3:configure: check for SPLICE_F_MOVE at configure stage
       via  ede2fa8 heimdal:lib/wind: include <stdlib.h> at the end
       via  326d174 heimdal:lib/wind: make sure errorlist_table.c includes config.h as first header
       via  8283d9e attr: Look for attr/attributes.h too.
       via  bd45745 heimdal:lib/krb5: don't name a struct 'token'
       via  4edd8b8 s3-auth: Remove auth_netlogond
       via  9c715da s3-passdb: Remove pdb_ads
       via  d949736 s4-classicupgrade: Also ask testparm for 'smb passwd file'
       via  a0a2f79 WHATSNEW: Bump the version and announce the s3fs default
       via  d9f7195 s4-classicupgrade: Use "samba classic" description for samba3 NT4-like domains in samba3upgrade
       via  39766b7 s4-lib/param: FLAG DAY for the default FILE SERVER
       via  b58dc18 s4-s3upgrade: Assert that administrator has a SID of -500, and only skip root if it is -500
       via  61f7f01 s4-s3upgrade: Add my wins.dat and fix the parsing error
       via  d0b60f0 s4-s3upgrade: improve idmap import to use posixAccount and posixGroup entries
       via  3c65bac s4-idmap: Add mapping using uidNumber and gidNumber like idmap_ad
       via  bbb7cbf Same fix as bug 8989 - Samba 3.5.x (and probably all other versions of Samba) does not send correct responses to NT Transact Secondary when no data and no params
       via  816c40c Fix Bug 8989 - Samba 3.5.x (and probably all other versions of Samba) does not send correct responses to NT Transact Secondary when no data and no params
       via  985dbed s3: Slightly simplify grant_fsp_oplock_type
       via  d1d36d2 s4-selftest: Add tests for dbcheck on an old database that needs repair
       via  fa223eb s4-dbcheck: Always specify the dhcheck control
       via  72953b1 selftest: Add targetdir and tdbrestore parameters to undump.sh
       via  7a723c6 build: Remove support for non-64bit sendfile()
       via  6440720 selftest/flapping: mark samba4.nss.test using winbind(s3dc) as flakey
       via  917612a docs-xml: vfs_gpfs: add comment "per share option"
       via  3eba94c docs-xml: vfs_gpfs: fix typo
       via  54b6d29 docs-xml: add gpfs:acl option to vfs_gpfs man page
       via  289255c s3:vfs_gpfs: add "gpfs:acl" option
       via  442cb66 dbwrap: Remove an unnecessary ZERO_STRUCT
       via  3c94ba5 s3-winbindd: fix the build of idmap_ad modules.
       via  d7b0e9a s3-lib: Fix conversion of lib/events.c to modern tevent names
       via  1d9ff7d dbwrap: dbwrap_trans_store_uint32->dbwrap_trans_store_uint32_bystring
       via  64fec46 dbwrap: dbwrap_trans_store_int32->dbwrap_trans_store_int32_bystring
       via  07d6c25 dbwrap: dbwrap_trans_change_int32_atomic->dbwrap_trans_change_int32_atomic_bystring
       via  8b99d40 dbwrap: dbwrap_change_int32_atomic->dbwrap_change_int32_atomic_bystring
       via  9275d57 dbwrap: dbwrap_trans_change_uint32_atomic->dbwrap_trans_change_uint32_atomic_bystring
       via  37ad03f dbwrap: dbwrap_change_uint32_atomic->dbwrap_change_uint32_atomic_bystring
       via  8f94ecb dbwrap: dbwrap_store_uint32->dbwrap_store_uint32_bystring
       via  7f19a5a dbwrap: dbwrap_fetch_uint32->dbwrap_fetch_uint32_bystring
       via  749314f dbwrap: dbwrap_store_int32->dbwrap_store_int32_bystring
       via  737c0a5 dbwrap: dbwrap_fetch_int32->dbwrap_fetch_int32_bystring
       via  9afd4be s3-build: Do not write loadparm generated files into the build tree
       via  8e31d97 s3-lib: Convert lib/events.c to modern tevent names
       via  bf3235f docs: document new server role values
       via  60b6348 s3-auth: rework default auth methods around the lp_server_role() parameter
       via  67bdf4f lib/param: Use server role = 'standalone server' to be consistant with member server
       via  11db5b1 lib/param: make security=domain and security=ads conflict with being a DC
       via  b8815dc lib/param: Create a seperate server role for "active directory domain controller"
       via  b9a75d8 s3-auth: Merge SEC_DOMAIN and SEC_ADS cases in creating the default auth module list
       via  5df459a s3-auth: Fix system info3 return to be just SID_NT_SYSTEM
       via  9b3cf96 s3-auth: Fix system token generation not to dereference pointer as an integer
       via  f0c5800 s3-auth: Give the SYSTEM token all privileges
       via  8cca7b0 s3:smb2_server: remember the request_time on an incoming request
       via  d8b3687 s3:smbd: remember the request_time on an incoming request
       via  59733d9 heimdal:lib/hdb: <config.h> needs to be the first header
       via  8d3a291 auth.idl: mark confidential attributes as [noprint]
       via  b27f888 s3:vfs: change files_struct.fnum from int to uint64_t
       via  67108c8 s3:smbd: change trans2.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  d056fd1 s3:smbd: change smb2_write.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  bde0298 s3:smbd: change smb2_setinfo.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  1e0eb24 s3:smbd: change smb2_read.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  632560b s3:smbd: change smb2_notify.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  ec111bd s3:smbd: change smb2_lock.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  7738b57 s3:smbd: change smb2_ioctl.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  cf380e1 s3:smbd: change smb2_getinfo.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  66117c3 s3:smbd: change smb2_flush.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  d82f1fa s3:smbd: change smb2_find.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  5922580 s3:smbd: change smb2_close.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  78b9e1a s3:smbd: change smb2_break.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  65ea1e4 s3:smbd: change reply.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  3d7befa s3:smbd: change pipes.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  cd37c68 s3:smbd: change oplock.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  cdfc301 s3:smbd: change open.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  b4f6ef4 s3:smbd: change nttrans.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  93dd5a8 s3:smbd: change files.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  cb1c185 s3:smbd: change fake_file.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  ee6580c s3:smbd: change blocking.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  4d66d9f s3:smbd: change aio.c to use fsp_fnum_dbg() for logging fsp->fnum.
       via  eae8740 s3:vfs_default: use fsp_fnum_dbg() for fsp->fnum logging.
       via  959c10e s3:locking: change locking.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  7472380 s3:locking: change brlock.c to use fsp_fnum_dbg() for fsp->fnum logging.
       via  3309a52 s3:lib: add a utility function "fsp_fnum_dbg" for logging the fnum of an fsp
       via  0635af0 s3:lib: elaborate the comment for fsp_str_debug a bit.
       via  bbf519d s3:lib: remove part of a comment for fsp_str_dbg that does not apply any more.
       via  b8e943e s3:smbd: change FNUM_FIELD_INVALID from -1 to 0
       via  5d2af68 s3:smbd: use FNUM_FIELD_INVALID instead of literal -1
       via  63bfc70a s3:include: define FNUM_FIELD_INVALID - the invalid value for the fnum
       via  a7dccea s3:files: factor fsp_free() out of file_free()
       via  7aa9ad5 s3:files: reorder file_free() a bit
       via  82a96d2 s3:smbd: refactor fsp_new() out of file_new()
       via  98bd0d1 waf: Update to newer upstream snapshot.
       via  eacb77b update-waf.sh: make mktemp happy by including anything Xes.
       via  ce10a7a lib/util: Fix typo in comment.
       via  ec60944 make librpc/build_idl.sh more portable
       via  3f110e5 s3:smbd: use fsp_persistent_id() as persistent_file_id part for SMB2 (bug #8995)
       via  47f837c s3:smbd: add a fsp_persistent_id() function
       via  5662166 s3:smbd: only set fsp->fh->gen_id for a client connection
       via  c7c351b s3:smbd: try to make fsp->fh->gen_id as globally unique as possible
       via  2fd28dc s3: Simplify tdb_data_is_cstr a bit
       via  bc9003d tdb2: remove unused debug_fprintf() macro that breaks the build
       via  e2caba0 tdb: remove unused debug_fprintf() macro that breaks the build
       via  deca298 lib/replace: define HAVE_WORKING_STRPTIME instead of REPLACE_STRPTIME
       via  0a92ac2 lib/replace: execute strptime.c tests
       via  e3a3c0d Revert "replace: use replace for non 'samba' compliant strptime"
       via  4430d6a lib/replace: add more condition to add snprintf.c
       via  1746ffe Revert "lib/replace: Fix snprintf() override for systems with a broken snprintf()"
       via  4e1ebdc lib/replace: s/execute=1/execute=True
       via  7e63e22 s3: Fix a comment
       via  6edb239 replace: fix unused variable warning
       via  6a3b3fa Revert "replace: fix unused variable warning"
       via  43c56dc s3: fix build without ads support
       via  e2747fc replace: fix unused variable warning
       via  dba3b2e doc: fix typo uniq → unique
       via  96ada4d s4:ntvfs: add '_fn' suffix to all ntvfs_ops function pointers
       via  855d23b s3: Use talloc_tos() in more places in dbwrap_util
       via  080c1ca s3: Make --pw-nt-hash useable in smbclient
       via  a40a566 s3: Add --pw-nt-hash to popt_common_credentials
       via  93e950c s3: Add cli_state->pw_nt_hash
       via  2be5ace s3: Add user_auth_info->use_pw_nt_hash
       via  93e0844 s3-libsmbclient: change vnum to 0.2.0
       via  6c13a46 s3-libsmbclient: Add OptionUseNTHash
       via  4fb283e s3: Add CLI_FULL_CONNECTION_USE_NT_HASH
       via  3b63a67 S3: Add ntlmssp_set_password_hash
       via  ae82192 s3-libsmbclient: Make SMBC_call_auth_fn static
       via  25216d7 s4:smbd: fix typos
       via  23a73c5 s4:kerberos: fix typos in kerberos-notes.txt
       via  6b2175c s4:gensec: fix a comment typo
       via  7dd22bd s4:torture: fix use of non-existent word (existant)
       via  2a1ab92 s4:tests: fix use of a non-existent word (existant)
       via  cec6ebf s4:provision: fix use of non-existent word (existant)
       via  acd3a6b s4:registry:testsuite: fix use of non-existent word (existant)
       via  d91182c s4:heimdal: fix use of a non-existent word (existant)
       via  72a92b8 s3:torture: fix use of non-existent word (existant)
       via  51a1936 s3:printing: fix use of a non-existent word (existant)
       via  21a36aa s3:vfs:scannedonly: fix use of non-existent word (existant)
       via  33ebba9 libsmbclient: fix use of a non-existent word (existant)
       via  08e9b17 selftest: fix use of a non-existent word (existant)
       via  9995257 lib/testtools: fix use of a non-existent word (existant)
       via  0688cf1 tdb:tests: fix use of a non-existent word (existant)
       via  ff053de ldb:tests: fix use of a non-existent word (existant)
       via  d93d041 pidl/tests: fix use of a non-existent word (existant)
       via  89f95c0 lib/util: fix use of a non-existent word (existant) in a comment
       via  6977cb3 nsstest: fix use of a non-existent word (existant)
       via  fac6191 s3: Make vfswrap_audit_file static
       via  2e77833 s3: Fix Coverity ID 703870 Uninitialized scalar variable
       via  386be83 s3: Save errno around a TALLOC_FREE
       via  1004218 s3: Fix Coverity ID 703871 Unused pointer value
       via  1b0690f s3/doc: some spelling fixes
       via  17d5fbd s3-winbindd: add comments about dump_core_setup
       via  4c33f28 s3:smbd: explain parameters to filename_convert call in smbd_smb2_create_send()
       via  34c24c2 s3: Fix Coverity ID 703869 Logically dead code
       via  e1a4d3c s3: Fix Coverity ID 709049 Dereference before null check
       via  c2094e3 debug: Do not constantly rename logs when max log size = 0
       via  61ab9a4 file_server: Use samba4 auth module for guest logins as well
       via  92fd0fd lib/param: simplfy lp_find_security()
       via  657af5a pyldb: Ensure that the ldb argument is really an ldb before we dereference
       via  6aee802 s3-smbd: Remove unused branches in negprot since security=share was removed
       via  29ff3ce s4-selftest: Test samba-tool drs replicate --local --full-sync
       via  ba44bd3 libcli/nbt: remove unused system/network.h from libnbt.h
       via  43090fb lib/ldb/tools: add missing "replace.h"
       via  527fdb2 s3/test: make dd call more portable
       via  2fb4c55 s4/pvfs: handle non-POSIX compliant Tru64, NetBSD and FreeBSD errno on O_NOFOLLOW symlink open calls
       via  f97ca7d s3: fix build on systems without O_NOFOLLOW
       via  bff935b wafsamba: try to fix the build on AIX with xlc_r
       via  0eeaf10 heimdal:lib/asn1: try to fix the build on IRIX
       via  c48e307 Revert "s3:smbd: set req->smb2req->compat_chain_fsp in file_fsp()"
       via  f75f1d6 s3: handle non-POSIX compliant Tru64, NetBSD and FreeBSD errno on O_NOFOLLOW symlink open calls
       via  046dacc s3:smb2_ioctl: make use of file_fsp_smb2()
       via  7753a4a s3:smb2_lock: make use of file_fsp_smb2()
       via  951c5a6 s3:smb2_write: make use of file_fsp_smb2()
       via  564e618 s3:smb2_read: make use of file_fsp_smb2()
       via  0bf3b8a s3:smb2_notify: make use of file_fsp_smb2()
       via  26f37cb s3:smb2_setinfo: make use of file_fsp_smb2()
       via  4bc10b5 s3:smb2_getinfo: make use of file_fsp_smb2()
       via  4dfadfc s3:smb2_find: make use of file_fsp_smb2()
       via  3909ad4 s3:smb2_break: make use of file_fsp_smb2()
       via  2bb6a9e s3:smb2_close: make use of file_fsp_smb2()
       via  9e1e656 s3:smb2_flush: make use of file_fsp_smb2()
       via  2a804a3 s3:smbd: add file_fsp_smb2()
       via  7256405 s3:smb2_write: pass fsp->fnum to init_strict_lock_struct()
       via  0d77585 s3:smb2_read: pass fsp->fnum to init_strict_lock_struct()
       via  4ae96bb s3:smb2_lock: use fsp->fnum as locking context
       via  3b2e592 s3:smb2_lock: use smb2req->compat_chain_fsp instead of looking it up again
       via  163207a s3:smbd: set req->smb2req->compat_chain_fsp in file_fsp()
       via  3dbfb25 s3:smb2_close: add missing TALLOC_FREE(subreq) in smbd_smb2_request_close_done()
       via  fc96488 s3:smbd: readd START_PROFILE(smbd_idle)/END_PROFILE(smbd_idle)
       via  36353a9 tdb2: use ccan/err instead of err.h
       via  aeb3ff5 ccan: make failtest use ccan/err.
       via  d9ce876 ccan: import err module.from ccan revision 5add556a1cb64b49a664506aa76216d885b22c97
       via  8a338c6 s3:smbd: change set_file_oplock() to return NTSTATUS
       via  088ca00 s3: Replace an if with a boolean short circuit
       via  a3b4a5d s3: Assigning ?True:False to a bool is a bit pointless
       via  4aea0c1 s3: Remove unnecessary ()
       via  a512780 s3: Replace an if with a boolean short circuit
       via  91be6b4 s3: Assigning ?True:False to a bool is a bit pointless
       via  e1e1fbc s3: Remove unnecessary ()
       via  b725154 tevent: change version to 0.9.16
       via  ba65400 tevent: expose tevent_context_init_ops
       via  796acbd lib/tevent: Add trace point callback
       via  653cb76 lib/tevent: In poll_event_context, add a pointer back to the tevent_context
       via  41d830e s3:smbd: remove unnecessary variable readret from read_file()
       via  eb750d5 s3:smbd: remove ancient DMF_FIX from read_file().
       via  80d3702 build: do not run fsrvp tests as part of selftest
       via  53c62bc s4-torture: fsrvp test suite
       via  34aa2bd doc: add FSRVP commands to rpcclient man page
       via  ac7b60a s3-rpcclient: add fsrvp commands
       via  2836787 idl: add File Server Remote VSS Protocol idl
       via  03767f5 samba_util: mark smb_panic as _NORETURN_.
       via  0ea7152 s3-winbindd: call dump_core_setup after command line option has been parsed
       via  48b6c6a s3-waf: Fix the winbindd active directory idmap support build.
       via  2bdfd28 build: try to fix large file support for AIX
       via  35a2d02 ccan: Only build ccan-failtest when we are in developer mode
       via  4c9126d lib/tdb2: build tests when built at toplevel.
       via  e102350 waf: fix parsing krb5-config --version for MIT krb5
       via  23aac20 waf: support --without-ad-dc for Heimdal (embedded and system) as well
       via  8778e41 build: fix typo that breaks the HP-UX build
       via  0dd4363 build: Tidy up broken posix_fallocate tests
       via  06c90cb s4-libcli: Remove unused finddcs_nbt
       via  1e28aa1 build: Add missing deps and make MESSAGING a private library
       via  15cebf3 util: fix build on platforms without IPv6 support
       via  67ef65a s3: enable winbind also for upcoming FreeBSD/NetBSD releases >=10
       via  e9f9f37 script/commit_mark.sh: add the current branch name
       via  1c01cb4 s3:include: change lock_struct->fnum to uint64_t
       via  fab6607 s3:include: change lock_context->tid to uint32_t
       via  4389097 s3:include: change connection_struct->cnum to uint32_t
       via  86f6214 s3:include: change smb_request->tid to uint32_t
       via  eb70aff s3:smb: change the value of TID_FIELD_INVALID from -1 to 0
       via  ba16994 s3:smb: introduce a name TID_FIELD_INVALID for the invalid value for a cnum/tid
       via  aa3a7de s3:connections: add a CNUM_OFFSET for mapping between cnum and the bitmap index
       via  82a9d23 s3:smb.h: fix a comment typo
       via  abe4798 s4:dns-server: remove an extra blank line from handle_question()
       via  238d24a auth-kerberos: avoid crash with MIT krb5 1.10.0 in gss_get_name_attribute()
       via  f3df298 s4 dns: Correctly handle A questions for CNAMEs
       via  754c60e s4 dns: Structure tests a bit better
       via  02d9ba6 s3:smbd: change user_struct->vuid to uint64_t
       via  bb27bb0 s3:smbd: let file_close_pid/file_close_user take a uint64_t vuid
       via  7d77206 s3:smbd: pass down vuid as uint64_t in lanman.c
       via  612838d s3:smbd: pass down vuid as uint64_t in ipc.c
       via  d3e79a8 s3:smbd: change vuid to uint64_t in uid.c
       via  c535668 s3:smbd: let fcb_or_dos_open() take a uint64_t vuid
       via  9ffb8f1 s3:smbd: let close_cnum() take a uint64_t vuid
       via  69d1f9b s3:smbd: use UID_FIELD_INVALID (0) instead of (uint16)-1 when calling close_cnum()
       via  2a9a95e s3:smbd: let make_connection() take a uint64_t vuid
       via  19d0517 s3:smbd: let conn_clear_vuid_caches() take a uint64_t vuid
       via  2477c73 s3:smbd: let open_fake_file() take a uint64_t vuid
       via  484cb4e s3:printing: let print_spool_open() take a uint64_t vuid
       via  53cd38e s3:smbd: change conn_ctx->vuid to uint64_t
       via  c0e5cc0 s3:include: change current_user->vuid to uint64_t
       via  21e6db8 s3:smbd: change trans_state->vuid to uint64_t
       via  d4aa494 s3:include: change smb_request->vuid to uint64_t
       via  d45e0dd s3:include: move struct smb_request to vfs.h
       via  37bfadf s3:include: change files_struct->vuid to uint64_t
       via  5a260a1 s3:include: change connection_struct->vuid to uint64_t
       via  defebd9 s3:includes: change vuid_cache_entry->vuid to uint64_t
       via  36c7016 s3:include: move sys_acl prototypes to smb_acls.h
       via  bc39915 s3:smbd: move struct user_struct to globals.h
       via  b742a75 s3:include: remove typedef user_struct
       via  f52e573 s3:smbd: use 'struct user_struct' instead of typedef'ed 'user_struct'
       via  9e2e370 s3:smbd: move forward declaration of struct aio_extra to smbd.h
       via  b6319b5 s3:printing: use smbd/smbd.h instead of just smbd/proto.h in queue_process.c
       via  f454765 s3:torture: use smbd/smbd.h instead of just smbd/proto.h in vfstest_chain.c
       via  af4c99e s3:utils: use smbd/smbd.h instead of just smbd/proto.h
       via  7bc328d s3:modules: we don't need smbd/proto.h in vfs_shadow_copy2.c
       via  16be476 s3:lib: we don't need smbd/proto.h in smbd_shim.c
       via  04ab606 examples/VFS: don't use smbd/proto.h
       via  9b5c2ca s3:include: move some prototypes (e.g. smb_register_vfs) to vfs.h
       via  c44d2e9 s3:include: remove unused forward declaration of deferred_open_record in smb.h
       via  5306c18 s3:smbd: move UCF_ defines to smbd.h
       via  4a22dd6 s3:include: move struct smb_filename to vfs.h
       via  22cfc8e s3:include: move struct smb_file_time to vfs.h
       via  5fc502c s3:include: move struct connection_struct (and sub structs) to vfs.h
       via  f88d13b s3:include: move struct stream_struct to vfs.h
       via  b9500bd s3:include: move struct fd_handle/files_struct to vfs.h
       via  f78cc3a s3:includes: move union unid_t to vfs.h
       via  44482ad s3:smbd: move struct trans_state to smbd.h
       via  ce41497 s3:smbd: move struct privilege_paths to smbd.h
       via  659f3e6 s3:smbd: make struct notify_change_buf private to notify.c
       via  b5b943d s3:smbd: make use of change_notify_fsp_has_changes()
       via  dc962c1 s3:smbd: add change_notify_fsp_has_changes()
       via  d1d7904 s3:printing: add print_spool_rap_jobid()
       via  6d2d8f5 s3:printing: make struct print_file_data private to printspoolss.c
       via  e91c223 s3:smbd: use print_spool_rap_jobid() in call_trans2ioctl()
       via  c2ffe33 s3:smbd: use print_spool_rap_jobid() in reply_ioctl()
       via  145fe2a s3:smbd: fcb_or_dos_open() can be static
       via  0907b1e s3:smbd: dup_file_fsp() never gets called for print files
       via  cf549ff s3:smbd: make struct vfs_fsp_data private to vfs.c
       via  4321e19 s3:smbd: make use of vfs_remove_all_fsp_extensions() in file_free()
       via  cd3e658 s3:smbd: add vfs_remove_all_fsp_extensions()
       via  a8e7c57 s3:includes: move struct share_mode_lock to locking.h
       via  05dc497 s3:smbd: remove typedef for struct write_cache
       via  4a91321 s3:smbd: make typedef write_cache private to fileio.c
       via  01b726d s3-libsmb: Fix error messages to correctly mention PLAINTEXT not LM
       via  d2f6d0b build: Rationalise AIO support in configure, ensure on by default
       via  bbc1b0c lib/replace: Fix snprintf() override for systems with a broken snprintf()
       via  f1becfa s3: temporary hack to make the waf build work withouth autotools being required
       via  8693a4f s3:lib: split things into a conn_tdb.h
       via  5a12293 s3:libsmb: fix the talloc parent of clistr_pull_talloc() in cli_notify_done()
       via  7ef4ae4 s3:libsmb: change cli_sesssetup_blob_* to use uint8_t instead of char for inbuf
       via  2b5d4d4 s3:libsmb: use inhdr instead of inbuf in tree connect related functions
       via  ae627a5 s3:libsmb: use inhdr instead of inbuf in session setup related functions
       via  a868a51 s3:libsmb: remove unused 'inbuf' variable
       via  324c51c s3:libsmb: don't require a pinbuf in cli_smb_recv() to keep the memory
       via  cd99e61 s4:torture/locktest: fix compiler warning
       via  5cc86fd s3: remove dependency on automake for "make everything"
       via  06a6eb6 VERSION: mark as beta2 as we move on to the next release
      from  bbe6cad VERSION: Mark release as beta1

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                         |   12 +-
 VERSION                                            |    2 +-
 WHATSNEW.txt                                       |   64 +-
 auth/kerberos/gssapi_pac.c                         |   20 +-
 buildtools/update-waf.sh                           |    2 +-
 buildtools/wafadmin/Tools/python.py                |   20 +-
 buildtools/wafsamba/irixcc.py                      |    4 +-
 buildtools/wafsamba/samba3.py                      |   15 +-
 buildtools/wafsamba/samba_autoconf.py              |   11 +-
 buildtools/wafsamba/samba_conftests.py             |    8 +
 dfs_server/dfs_server_ad.c                         |    6 +-
 docs-xml/manpages-3/net.8.xml                      |    2 +-
 docs-xml/manpages-3/rpcclient.1.xml                |   45 +
 docs-xml/manpages-3/vfs_gpfs.8.xml                 |   24 +-
 docs-xml/smbdotconf/ldap/ldapsameditposix.xml      |    2 +-
 docs-xml/smbdotconf/locking/lockspincount.xml      |    2 +-
 docs-xml/smbdotconf/logging/ldapdebuglevel.xml     |    2 +-
 docs-xml/smbdotconf/logon/abortshutdownscript.xml  |    2 +-
 .../smbdotconf/logon/setprimarygroupscript.xml     |    2 +-
 docs-xml/smbdotconf/logon/shutdownscript.xml       |    2 +-
 docs-xml/smbdotconf/misc/ctdbtimeout.xml           |    2 +-
 docs-xml/smbdotconf/printing/printcapname.xml      |    2 +-
 docs-xml/smbdotconf/printing/useclientdriver.xml   |    2 +-
 .../smbdotconf/protocol/minreceivefilesize.xml     |    2 +-
 docs-xml/smbdotconf/protocol/usespnego.xml         |    2 +-
 docs-xml/smbdotconf/security/aclgroupcontrol.xml   |    2 +-
 .../smbdotconf/security/algorithmicridbase.xml     |    2 +-
 docs-xml/smbdotconf/security/passwordserver.xml    |    4 +-
 docs-xml/smbdotconf/security/restrictanonymous.xml |    2 +-
 docs-xml/smbdotconf/security/serverrole.xml        |   26 +-
 docs-xml/smbdotconf/security/usernamemap.xml       |    2 +-
 .../smbdotconf/tuning/paranoidserversecurity.xml   |    4 +-
 docs-xml/smbdotconf/tuning/strictallocate.xml      |    2 +-
 docs-xml/smbdotconf/vfs/setquotacommand.xml        |    2 +-
 docs-xml/smbdotconf/winbind/createkrb5conf.xml     |    2 +-
 docs-xml/smbdotconf/winbind/idmapconfig.xml        |    4 +-
 .../smbdotconf/winbind/winbindnormalizenames.xml   |    2 +-
 examples/VFS/shadow_copy_test.c                    |    1 -
 examples/VFS/skel_opaque.c                         |    1 -
 examples/VFS/skel_transparent.c                    |    1 -
 file_server/file_server.c                          |    1 -
 lib/ccan/err/.depends                              |    1 +
 lib/ccan/err/_info                                 |   41 +
 lib/ccan/err/err.c                                 |   64 +
 lib/ccan/err/err.h                                 |   87 +
 lib/ccan/err/test/run.c                            |  153 +
 lib/ccan/failtest/_info                            |    1 +
 lib/ccan/failtest/failtest.c                       |    3 +-
 lib/ccan/libccan.m4                                |    2 +
 lib/ccan/wscript                                   |   19 +-
 lib/dbwrap/dbwrap.h                                |   56 +-
 lib/dbwrap/dbwrap_rbt.c                            |    1 -
 lib/dbwrap/dbwrap_util.c                           |   70 +-
 lib/ldb-samba/ldb_wrap.c                           |    5 +-
 lib/ldb-samba/wscript_build                        |    2 +-
 lib/ldb/ldb_tdb/ldb_index.c                        |    6 +-
 lib/ldb/ldb_tdb/ldb_search.c                       |    6 +-
 lib/ldb/ldb_tdb/ldb_tdb.c                          |    8 +-
 lib/ldb/ldb_tdb/ldb_tdb.h                          |    2 +-
 lib/ldb/ldb_tdb/ldb_tdb_wrap.c                     |   33 +-
 lib/ldb/pyldb.c                                    |   10 +
 lib/ldb/tests/python/api.py                        |    2 +-
 lib/ldb/tools/ldbadd.c                             |    1 +
 lib/ldb/tools/ldbmodify.c                          |    1 +
 lib/ldb/tools/ldbrename.c                          |    1 +
 lib/ldb/tools/ldbutil.c                            |    1 +
 lib/ldb/wscript                                    |   14 +-
 lib/ntdb/ABI/ntdb-0.9.sigs                         |   38 +
 lib/{tdb2 => ntdb}/LICENSE                         |    0
 lib/{tdb2 => ntdb}/Makefile                        |    0
 lib/ntdb/check.c                                   |  725 +++
 lib/{tdb2 => ntdb}/configure                       |    0
 lib/ntdb/doc/TDB_porting.txt                       |  426 ++
 lib/ntdb/doc/design.lyx                            | 2727 ++++++++++++
 lib/ntdb/doc/design.pdf                            |  Bin 0 -> 191943 bytes
 lib/ntdb/doc/design.txt                            | 1270 ++++++
 lib/ntdb/free.c                                    |  977 ++++
 lib/ntdb/hash.c                                    |  642 +++
 lib/ntdb/io.c                                      |  681 +++
 lib/ntdb/libntdb.m4                                |   41 +
 lib/ntdb/lock.c                                    |  883 ++++
 lib/ntdb/ntdb.c                                    |  583 +++
 lib/ntdb/ntdb.h                                    |  932 ++++
 lib/ntdb/ntdb.pc.in                                |   11 +
 lib/ntdb/open.c                                    |  910 ++++
 lib/ntdb/private.h                                 |  661 +++
 lib/ntdb/pyntdb.c                                  |  589 +++
 lib/ntdb/summary.c                                 |  321 ++
 lib/ntdb/test/api-12-store.c                       |   57 +
 lib/ntdb/test/api-13-delete.c                      |  204 +
 lib/ntdb/test/api-14-exists.c                      |   54 +
 lib/ntdb/test/api-16-wipe_all.c                    |   46 +
 lib/ntdb/test/api-20-alloc-attr.c                  |  108 +
 lib/ntdb/test/api-21-parse_record.c                |   67 +
 lib/ntdb/test/api-55-transaction.c                 |   73 +
 lib/ntdb/test/api-80-tdb_fd.c                      |   32 +
 lib/ntdb/test/api-81-seqnum.c                      |   69 +
 lib/ntdb/test/api-82-lockattr.c                    |  240 +
 lib/ntdb/test/api-83-openhook.c                    |  100 +
 lib/ntdb/test/api-91-get-stats.c                   |   61 +
 lib/ntdb/test/api-92-get-set-readonly.c            |  105 +
 lib/ntdb/test/api-93-repack.c                      |   80 +
 lib/ntdb/test/api-add-remove-flags.c               |   89 +
 lib/ntdb/test/api-check-callback.c                 |   87 +
 lib/ntdb/test/api-firstkey-nextkey.c               |  159 +
 lib/ntdb/test/api-fork-test.c                      |  199 +
 lib/ntdb/test/api-locktimeout.c                    |  193 +
 lib/ntdb/test/api-missing-entries.c                |   44 +
 lib/ntdb/test/api-open-multiple-times.c            |   83 +
 lib/ntdb/test/api-record-expand.c                  |   51 +
 lib/ntdb/test/api-simple-delete.c                  |   39 +
 lib/ntdb/test/api-summary.c                        |   58 +
 lib/ntdb/test/external-agent.c                     |  261 ++
 lib/ntdb/test/external-agent.h                     |   51 +
 lib/ntdb/test/failtest_helper.c                    |   99 +
 lib/ntdb/test/failtest_helper.h                    |   18 +
 lib/ntdb/test/helpapi-external-agent.c             |    7 +
 lib/ntdb/test/helprun-external-agent.c             |    7 +
 lib/ntdb/test/helprun-layout.c                     |  362 ++
 lib/ntdb/test/layout.h                             |   79 +
 lib/ntdb/test/lock-tracking.c                      |  147 +
 lib/{tdb2 => ntdb}/test/lock-tracking.h            |    0
 lib/ntdb/test/logging.c                            |   30 +
 lib/ntdb/test/logging.h                            |   17 +
 lib/ntdb/test/ntdb-source.h                        |   11 +
 lib/ntdb/test/run-001-encode.c                     |   39 +
 lib/ntdb/test/run-001-fls.c                        |   33 +
 lib/ntdb/test/run-01-new_database.c                |   34 +
 lib/ntdb/test/run-02-expand.c                      |   62 +
 lib/ntdb/test/run-03-coalesce.c                    |  178 +
 lib/ntdb/test/run-04-basichash.c                   |  321 ++
 lib/ntdb/test/run-05-readonly-open.c               |   71 +
 lib/ntdb/test/run-10-simple-store.c                |   58 +
 lib/ntdb/test/run-11-simple-fetch.c                |   58 +
 lib/ntdb/test/run-12-check.c                       |   46 +
 lib/ntdb/test/run-15-append.c                      |  130 +
 lib/ntdb/test/run-25-hashoverload.c                |   92 +
 lib/ntdb/test/run-30-exhaust-before-expand.c       |   75 +
 lib/ntdb/test/run-35-convert.c                     |   58 +
 lib/ntdb/test/run-50-multiple-freelists.c          |   70 +
 lib/ntdb/test/run-56-open-during-transaction.c     |  165 +
 lib/ntdb/test/run-57-die-during-transaction.c      |  321 ++
 lib/ntdb/test/run-64-bit-tdb.c                     |   88 +
 lib/ntdb/test/run-90-get-set-attributes.c          |  159 +
 lib/ntdb/test/run-capabilities.c                   |  271 ++
 lib/ntdb/test/run-expand-in-transaction.c          |   46 +
 lib/ntdb/test/run-features.c                       |   62 +
 lib/ntdb/test/run-lockall.c                        |   74 +
 lib/ntdb/test/run-remap-in-read_traverse.c         |   57 +
 lib/ntdb/test/run-seed.c                           |   61 +
 lib/ntdb/test/run-tdb_errorstr.c                   |   52 +
 lib/ntdb/test/run-tdb_foreach.c                    |   86 +
 lib/ntdb/test/run-traverse.c                       |  203 +
 lib/{tdb2 => ntdb}/test/tap-interface.c            |    0
 lib/ntdb/test/tap-interface.h                      |   41 +
 lib/ntdb/tools/Makefile                            |   16 +
 lib/ntdb/tools/growtdb-bench.c                     |  114 +
 lib/ntdb/tools/mkntdb.c                            |   29 +
 lib/ntdb/tools/ntdbbackup.c                        |  340 ++
 lib/ntdb/tools/ntdbdump.c                          |  122 +
 lib/ntdb/tools/ntdbrestore.c                       |  251 ++
 lib/ntdb/tools/ntdbtool.c                          |  810 ++++
 lib/ntdb/tools/ntdbtorture.c                       |  545 +++
 lib/ntdb/tools/speed.c                             |  441 ++
 lib/ntdb/transaction.c                             | 1300 ++++++
 lib/ntdb/traverse.c                                |  100 +
 lib/ntdb/wscript                                   |  265 ++
 lib/param/loadparm.c                               |   10 +-
 lib/param/loadparm_server_role.c                   |   27 +-
 lib/param/param.h                                  |    5 +-
 lib/param/param_enums.c                            |   10 +-
 lib/param/util.c                                   |    1 +
 lib/replace/replace.h                              |    2 +-
 lib/replace/strptime.c                             |    9 +-
 lib/replace/strptime.m4                            |    5 +-
 lib/replace/system/filesys.h                       |    2 +
 lib/replace/wscript                                |   45 +-
 lib/replace/xattr.c                                |    2 +-
 lib/tdb/python/tests/simple.py                     |    4 +-
 lib/tdb/tools/tdbrestore.c                         |    2 -
 lib/tdb/wscript                                    |    8 +-
 lib/tdb2/ABI/tdb-2.0.0.sigs                        |   40 -
 lib/tdb2/TODO                                      |    4 -
 lib/tdb2/_info                                     |   91 -
 lib/tdb2/check.c                                   |  870 ----
 lib/tdb2/doc/TDB1_porting.txt                      |   72 -
 lib/tdb2/doc/design-1.3.txt                        | 1049 -----
 lib/tdb2/doc/design.lyx                            | 2689 -----------
 lib/tdb2/doc/design.lyx,v                          | 4679 --------------------
 lib/tdb2/doc/design.pdf                            |  Bin 240440 -> 0 bytes
 lib/tdb2/doc/design.txt                            | 1258 ------
 lib/tdb2/free.c                                    |  975 ----
 lib/tdb2/hash.c                                    |  913 ----
 lib/tdb2/io.c                                      |  658 ---
 lib/tdb2/lock.c                                    |  895 ----
 lib/tdb2/open.c                                    |  884 ----
 lib/tdb2/private.h                                 |  780 ----
 lib/tdb2/pytdb.c                                   |  591 ---
 lib/tdb2/summary.c                                 |  338 --
 lib/tdb2/tdb.c                                     |  649 ---
 lib/tdb2/tdb.pc.in                                 |   11 -
 lib/tdb2/tdb1_check.c                              |  479 --
 lib/tdb2/tdb1_freelist.c                           |  322 --
 lib/tdb2/tdb1_hash.c                               |  347 --
 lib/tdb2/tdb1_io.c                                 |  530 ---
 lib/tdb2/tdb1_lock.c                               |  560 ---
 lib/tdb2/tdb1_open.c                               |  234 -
 lib/tdb2/tdb1_private.h                            |  178 -
 lib/tdb2/tdb1_summary.c                            |  202 -
 lib/tdb2/tdb1_tdb.c                                |  833 ----
 lib/tdb2/tdb1_transaction.c                        | 1336 ------
 lib/tdb2/tdb1_traverse.c                           |  373 --
 lib/tdb2/tdb2.h                                    |  941 ----
 lib/tdb2/test/api-12-store.c                       |   57 -
 lib/tdb2/test/api-13-delete.c                      |  210 -
 lib/tdb2/test/api-14-exists.c                      |   59 -
 lib/tdb2/test/api-16-wipe_all.c                    |   51 -
 lib/tdb2/test/api-21-parse_record.c                |   72 -
 lib/tdb2/test/api-55-transaction.c                 |   76 -
 lib/tdb2/test/api-80-tdb_fd.c                      |   37 -
 lib/tdb2/test/api-81-seqnum.c                      |   80 -
 lib/tdb2/test/api-82-lockattr.c                    |  248 --
 lib/tdb2/test/api-83-openhook.c                    |  100 -
 lib/tdb2/test/api-91-get-stats.c                   |   60 -
 lib/tdb2/test/api-92-get-set-readonly.c            |  121 -
 lib/tdb2/test/api-93-repack.c                      |   83 -
 lib/tdb2/test/api-add-remove-flags.c               |   94 -
 lib/tdb2/test/api-check-callback.c                 |   91 -
 lib/tdb2/test/api-firstkey-nextkey.c               |  164 -
 lib/tdb2/test/api-fork-test.c                      |  205 -
 lib/tdb2/test/api-locktimeout.c                    |  196 -
 lib/tdb2/test/api-missing-entries.c                |   44 -
 lib/tdb2/test/api-open-multiple-times.c            |   94 -
 lib/tdb2/test/api-record-expand.c                  |   56 -
 lib/tdb2/test/api-simple-delete.c                  |   44 -
 lib/tdb2/test/api-summary.c                        |   64 -
 lib/tdb2/test/api-tdb1-flag-removal.c              |   39 -
 lib/tdb2/test/external-agent.c                     |  252 --
 lib/tdb2/test/external-agent.h                     |   51 -
 lib/tdb2/test/failtest_helper.c                    |   96 -
 lib/tdb2/test/failtest_helper.h                    |   19 -
 lib/tdb2/test/helpapi-external-agent.c             |    8 -
 lib/tdb2/test/helprun-external-agent.c             |   10 -
 lib/tdb2/test/helprun-layout.c                     |  402 --
 lib/tdb2/test/jenkins-be-hash.tdb1                 |  Bin 696 -> 0 bytes
 lib/tdb2/test/jenkins-le-hash.tdb1                 |  Bin 696 -> 0 bytes
 lib/tdb2/test/layout.h                             |   87 -
 lib/tdb2/test/lock-tracking.c                      |  158 -
 lib/tdb2/test/logging.c                            |   30 -
 lib/tdb2/test/logging.h                            |   17 -
 lib/tdb2/test/old-nohash-be.tdb1                   |  Bin 696 -> 0 bytes
 lib/tdb2/test/old-nohash-le.tdb1                   |  Bin 696 -> 0 bytes
 lib/tdb2/test/run-001-encode.c                     |   41 -
 lib/tdb2/test/run-001-fls.c                        |   33 -
 lib/tdb2/test/run-01-new_database.c                |   39 -
 lib/tdb2/test/run-02-expand.c                      |   62 -
 lib/tdb2/test/run-03-coalesce.c                    |  178 -
 lib/tdb2/test/run-04-basichash.c                   |  260 --
 lib/tdb2/test/run-05-readonly-open.c               |   75 -
 lib/tdb2/test/run-10-simple-store.c                |   63 -
 lib/tdb2/test/run-11-simple-fetch.c                |   63 -
 lib/tdb2/test/run-12-check.c                       |   50 -
 lib/tdb2/test/run-15-append.c                      |  153 -
 lib/tdb2/test/run-20-growhash.c                    |  137 -
 lib/tdb2/test/run-25-hashoverload.c                |  113 -
 lib/tdb2/test/run-30-exhaust-before-expand.c       |   72 -
 lib/tdb2/test/run-35-convert.c                     |   57 -
 lib/tdb2/test/run-50-multiple-freelists.c          |   70 -
 lib/tdb2/test/run-56-open-during-transaction.c     |  169 -
 lib/tdb2/test/run-57-die-during-transaction.c      |  296 --
 lib/tdb2/test/run-64-bit-tdb.c                     |   72 -
 lib/tdb2/test/run-90-get-set-attributes.c          |  186 -
 lib/tdb2/test/run-capabilities.c                   |  272 --
 lib/tdb2/test/run-expand-in-transaction.c          |   39 -
 lib/tdb2/test/run-features.c                       |   62 -
 lib/tdb2/test/run-lockall.c                        |   74 -
 lib/tdb2/test/run-remap-in-read_traverse.c         |   57 -
 lib/tdb2/test/run-seed.c                           |   61 -
 lib/tdb2/test/run-tdb1-3G-file.c                   |  140 -
 lib/tdb2/test/run-tdb1-bad-tdb-header.c            |   52 -
 lib/tdb2/test/run-tdb1-check.c                     |   57 -
 lib/tdb2/test/run-tdb1-corrupt.c                   |  122 -
 lib/tdb2/test/run-tdb1-endian.c                    |   53 -
 lib/tdb2/test/run-tdb1-hashsize.c                  |   61 -
 lib/tdb2/test/run-tdb1-incompatible.c              |  209 -
 lib/tdb2/test/run-tdb1-nested-transactions.c       |   71 -
 lib/tdb2/test/run-tdb1-nested-traverse.c           |   85 -
 lib/tdb2/test/run-tdb1-no-lock-during-traverse.c   |  110 -
 lib/tdb2/test/run-tdb1-oldhash.c                   |   45 -
 lib/tdb2/test/run-tdb1-readonly-check.c            |   45 -
 lib/tdb2/test/run-tdb1-rwlock-check.c              |   42 -
 lib/tdb2/test/run-tdb1-seqnum-wrap.c               |   39 -
 lib/tdb2/test/run-tdb1-summary.c                   |   56 -
 lib/tdb2/test/run-tdb1-traverse-in-transaction.c   |   83 -
 lib/tdb2/test/run-tdb1-wronghash-fail.c            |  142 -
 lib/tdb2/test/run-tdb1-zero-append.c               |   34 -
 lib/tdb2/test/run-tdb1.c                           |   40 -
 lib/tdb2/test/run-tdb_errorstr.c                   |   52 -
 lib/tdb2/test/run-tdb_foreach.c                    |   86 -
 lib/tdb2/test/run-traverse.c                       |  203 -
 lib/tdb2/test/rwlock-be.tdb1                       |  Bin 696 -> 0 bytes
 lib/tdb2/test/rwlock-le.tdb1                       |  Bin 696 -> 0 bytes
 lib/tdb2/test/tap-interface.h                      |   41 -
 lib/tdb2/test/tdb1-external-agent.c                |  187 -
 lib/tdb2/test/tdb1-external-agent.h                |   43 -
 lib/tdb2/test/tdb1-lock-tracking.c                 |  146 -
 lib/tdb2/test/tdb1-lock-tracking.h                 |   26 -
 lib/tdb2/test/tdb1.corrupt                         |  Bin 192512 -> 0 bytes
 lib/tdb2/test/tdb2-source.h                        |   21 -
 lib/tdb2/tools/Makefile                            |   16 -
 lib/tdb2/tools/growtdb-bench.c                     |  114 -
 lib/tdb2/tools/mktdb2.c                            |   29 -
 lib/tdb2/tools/speed.c                             |  443 --
 lib/tdb2/tools/tdb2backup.c                        |  371 --
 lib/tdb2/tools/tdb2dump.c                          |  122 -
 lib/tdb2/tools/tdb2restore.c                       |  233 -
 lib/tdb2/tools/tdb2tool.c                          |  810 ----
 lib/tdb2/tools/tdb2torture.c                       |  545 ---
 lib/tdb2/transaction.c                             | 1343 ------
 lib/tdb2/traverse.c                                |  134 -
 lib/tdb2/wscript                                   |  225 -
 lib/tdb_compat/tdb_compat.c                        |  222 -
 lib/tdb_compat/tdb_compat.h                        |   85 -
 lib/tdb_compat/wscript                             |   11 +-
 lib/tdb_wrap/tdb_wrap.c                            |   34 +-
 lib/tdb_wrap/tdb_wrap.h                            |    2 +-
 lib/tdb_wrap/wscript_build                         |    2 +-
 lib/testtools/testtools/tests/test_compat.py       |    2 +-
 lib/tevent/ABI/tevent-0.9.16.sigs                  |   82 +
 lib/tevent/tevent.c                                |    8 +-
 lib/tevent/tevent.h                                |   57 +
 lib/tevent/tevent_debug.c                          |   23 +
 lib/tevent/tevent_epoll.c                          |    2 +
 lib/tevent/tevent_internal.h                       |    8 +
 lib/tevent/tevent_poll.c                           |    6 +
 lib/tevent/tevent_select.c                         |    2 +
 lib/tevent/tevent_standard.c                       |    2 +
 lib/tevent/wscript                                 |    2 +-
 lib/util/charset/convert_string.c                  |    2 +-
 lib/util/debug.c                                   |   34 +-
 lib/util/samba_util.h                              |    2 +-
 lib/util/string_wrappers.h                         |    2 +-
 lib/util/util_net.c                                |    2 +-
 lib/util/util_tdb.c                                |   12 +-
 lib/util/wscript_build                             |    2 +-
 libcli/auth/schannel_state_tdb.c                   |    4 +-
 libcli/nbt/libnbt.h                                |    1 -
 libcli/security/create_descriptor.c                |    7 -
 libds/common/roles.h                               |   10 +-
 libgpo/gpo_util.c                                  |    7 +-
 librpc/build_idl.sh                                |    3 +-
 librpc/idl/auth.idl                                |   13 +-
 librpc/idl/fsrvp.idl                               |  113 +
 librpc/idl/wscript_build                           |    4 +-
 librpc/wscript_build                               |   12 +-
 nsswitch/nsstest.c                                 |    8 +-
 pidl/tests/typelist.pl                             |    4 +-
 script/autobuild.py                                |   10 +-
 script/commit_mark.sh                              |   10 +-
 selftest/flapping                                  |    1 +
 selftest/skip                                      |    1 +
 selftest/target/Samba4.pm                          |   12 +-
 selftest/tests/test_target.py                      |    2 +-
 selftest/wscript                                   |    3 -
 source3/Makefile-smbtorture4                       |    2 +-
 source3/Makefile.in                                |   64 +-
 source3/auth/auth.c                                |   39 +-
 source3/auth/auth_netlogond.c                      |  448 --
 source3/auth/auth_util.c                           |  194 +-
 source3/auth/proto.h                               |    2 -
 source3/auth/wscript_build                         |    9 -
 source3/autoconf/lib/param/README                  |    3 +
 source3/autoconf/source3/param/README              |    3 +
 source3/autogen.sh                                 |   19 +-
 source3/configure.in                               |  131 +-
 source3/include/auth_info.h                        |    5 +
 source3/include/client.h                           |    2 +
 source3/include/fake_file.h                        |    2 +-
 source3/include/includes.h                         |    4 +-
 source3/include/libsmb_internal.h                  |   13 +-
 source3/include/libsmbclient.h                     |    8 +
 source3/include/local.h                            |    2 +-
 source3/include/locking.h                          |    8 +-
 source3/include/printing.h                         |    3 +-
 source3/include/proto.h                            |   53 +-
 source3/include/smb.h                              |  423 +--
 source3/include/smb_acls.h                         |   33 +
 source3/include/smb_macros.h                       |    2 +-
 source3/include/vfs.h                              |  279 ++
 source3/lib/conn_tdb.c                             |    1 +
 source3/lib/conn_tdb.h                             |   62 +
 source3/lib/events.c                               |   30 +-
 source3/lib/filename_util.c                        |   32 +-
 source3/lib/fncall.c                               |   42 -
 source3/lib/gencache.c                             |    5 -
 source3/lib/messages_local.c                       |    2 +-
 source3/lib/popt_common.c                          |    5 +
 source3/lib/pthreadpool/pthreadpool_sync.c         |  174 +
 source3/lib/pthreadpool/wscript_build              |   13 +-
 source3/lib/sendfile.c                             |   87 -
 source3/lib/sharesec.c                             |   16 +-
 source3/lib/smbd_shim.c                            |    1 -
 source3/lib/system.c                               |   20 +-
 source3/lib/tdb_validate.c                         |    4 -
 source3/lib/util_cmdline.c                         |   12 +
 source3/lib/util_tdb.c                             |  106 -
 source3/librpc/rpc/rpc_common.c                    |    4 +
 source3/libsmb/ABI/smbclient-0.2.0.sigs            |  172 +
 source3/libsmb/async_smb.c                         |    5 +
 source3/libsmb/cliconnect.c                        |  112 +-
 source3/libsmb/clidfs.c                            |    3 +
 source3/libsmb/clientgen.c                         |    7 +-
 source3/libsmb/clifile.c                           |   20 +-
 source3/libsmb/climessage.c                        |    3 +-
 source3/libsmb/clioplock.c                         |    3 +-
 source3/libsmb/clirap2.c                           |    2 +-
 source3/libsmb/clireadwrite.c                      |    3 +-
 source3/libsmb/libsmb_server.c                     |    6 +-
 source3/libsmb/libsmb_setget.c                     |   18 +
 source3/libsmb/ntlmssp.c                           |   22 +
 source3/libsmb/wscript                             |    2 +-
 source3/locking/brlock.c                           |   14 +-
 source3/locking/locking.c                          |   20 +-
 source3/locking/posix.c                            |   31 +-
 source3/modules/vfs_aio_fork.c                     |    8 +
 source3/modules/vfs_default.c                      |   26 +-
 source3/modules/vfs_gpfs.c                         |   81 +
 source3/modules/vfs_scannedonly.c                  |   10 +-
 source3/modules/vfs_shadow_copy2.c                 |    1 -
 source3/passdb/account_pol.c                       |   11 +-
 source3/passdb/pdb_ads.c                           | 2693 -----------
 source3/passdb/pdb_ipa.c                           |    8 +-
 source3/passdb/pdb_tdb.c                           |   31 +-
 source3/passdb/secrets.c                           |    4 +-
 source3/passdb/wscript_build                       |    9 -
 source3/printing/nt_printing.c                     |    2 +-
 source3/printing/printspoolss.c                    |   20 +-
 source3/printing/queue_process.c                   |    2 +-
 source3/registry/reg_backend_db.c                  |    9 +-
 source3/rpc_server/epmapper/srv_epmapper.c         |    9 -
 source3/rpc_server/lsa/srv_lsa_nt.c                |    9 +-
 source3/rpc_server/lsasd.c                         |   19 +-
 source3/rpc_server/samr/srv_samr_nt.c              |   23 +-
 source3/rpc_server/spoolss/srv_spoolss_nt.c        |    2 +-
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c          |    1 +
 source3/rpcclient/cmd_fss.c                        |  656 +++
 source3/rpcclient/rpcclient.c                      |    2 +
 source3/script/tests/test_smbclient_posix_large.sh |    2 +-
 source3/smbd/aio.c                                 |    6 +-
 source3/smbd/blocking.c                            |   29 +-
 source3/smbd/conn.c                                |   20 +-
 source3/smbd/conn_idle.c                           |    2 +-
 source3/smbd/connection.c                          |    3 +-
 source3/smbd/fake_file.c                           |    6 +-
 source3/smbd/fileio.c                              |   47 +-
 source3/smbd/files.c                               |  245 +-
 source3/smbd/globals.c                             |    2 +-
 source3/smbd/globals.h                             |   24 +-
 source3/smbd/ipc.c                                 |    9 +-
 source3/smbd/lanman.c                              |   76 +-
 source3/smbd/mangle_hash.c                         |    5 -
 source3/smbd/msdfs.c                               |    2 +-
 source3/smbd/negprot.c                             |   29 +-
 source3/smbd/notify.c                              |   37 +
 source3/smbd/nttrans.c                             |   21 +-
 source3/smbd/open.c                                |   71 +-
 source3/smbd/oplock.c                              |   21 +-
 source3/smbd/password.c                            |   45 +-
 source3/smbd/pipes.c                               |    6 +-
 source3/smbd/posix_acls.c                          |    2 +-
 source3/smbd/process.c                             |   23 +-
 source3/smbd/proto.h                               |   81 +-
 source3/smbd/reply.c                               |  116 +-
 source3/smbd/server.c                              |    1 +
 source3/smbd/service.c                             |   12 +-
 source3/smbd/session.c                             |   11 +-
 source3/smbd/sesssetup.c                           |    9 +-
 source3/smbd/smb2_break.c                          |   58 +-
 source3/smbd/smb2_close.c                          |   46 +-
 source3/smbd/smb2_create.c                         |    6 +-
 source3/smbd/smb2_find.c                           |   35 +-
 source3/smbd/smb2_flush.c                          |   35 +-
 source3/smbd/smb2_getinfo.c                        |   47 +-
 source3/smbd/smb2_glue.c                           |    1 +
 source3/smbd/smb2_ioctl.c                          |   42 +-
 source3/smbd/smb2_lock.c                           |   59 +-
 source3/smbd/smb2_negprot.c                        |    2 -
 source3/smbd/smb2_notify.c                         |   37 +-
 source3/smbd/smb2_read.c                           |   48 +-
 source3/smbd/smb2_server.c                         |    2 +
 source3/smbd/smb2_sesssetup.c                      |    6 +-
 source3/smbd/smb2_setinfo.c                        |   44 +-
 source3/smbd/smb2_tcon.c                           |    2 +-
 source3/smbd/smb2_write.c                          |   45 +-
 source3/smbd/smbd.h                                |   51 +
 source3/smbd/trans2.c                              |   63 +-
 source3/smbd/uid.c                                 |   24 +-
 source3/smbd/vfs.c                                 |   27 +
 source3/torture/test_dbwrap_watch.c                |    2 +-
 source3/torture/test_idmap_tdb_common.c            |    6 +-
 source3/torture/torture.c                          |   10 +-
 source3/torture/vfstest_chain.c                    |    2 +-
 source3/utils/dbwrap_tool.c                        |    8 +-
 source3/utils/net_g_lock.c                         |    3 +-
 source3/utils/net_idmap.c                          |    6 +-
 source3/utils/net_idmap_check.c                    |    4 +-
 source3/utils/net_registry_check.c                 |   13 +-
 source3/utils/net_serverid.c                       |    1 +
 source3/utils/net_status.c                         |    5 +-
 source3/utils/status.c                             |    5 +-
 source3/web/statuspage.c                           |    7 +-
 source3/winbindd/idmap_adex/idmap_adex.c           |    8 -
 source3/winbindd/idmap_adex/provider_unified.c     |   17 +-
 source3/winbindd/idmap_autorid.c                   |   17 +-
 source3/winbindd/idmap_tdb.c                       |   29 +-
 source3/winbindd/idmap_tdb2.c                      |   12 +-
 source3/winbindd/idmap_tdb_common.c                |    4 +-
 source3/winbindd/winbindd.c                        |   13 +
 source3/winbindd/wscript_build                     |    5 +-
 source3/wscript                                    |   28 +-
 source3/wscript_build                              |    3 +-
 source4/auth/gensec/gensec_krb5.c                  |    2 +-
 source4/auth/kerberos/kerberos-notes.txt           |    4 +-
 source4/auth/ntlm/auth.c                           |    1 +
 source4/auth/ntlm/auth_sam.c                       |    2 +-
 source4/auth/ntlm/wscript_build                    |    2 +-
 source4/auth/unix_token.c                          |    2 -
 source4/cldap_server/cldap_server.c                |    2 +-
 source4/cluster/local.c                            |    1 -
 source4/dns_server/dns_query.c                     |   62 +-
 source4/dns_server/dns_server.c                    |    2 +-
 source4/dsdb/dns/dns_update.c                      |    2 +-
 source4/dsdb/kcc/kcc_service.c                     |    2 +-
 source4/dsdb/repl/drepl_service.c                  |    2 +-
 .../dsdb/samdb/ldb_modules/partition_metadata.c    |   12 +-
 .../dsdb/samdb/ldb_modules/wscript_build_server    |    2 +-
 source4/echo_server/echo_server.c                  |    2 +-
 source4/heimdal/lib/asn1/gen_template.c            |    8 +-
 source4/heimdal/lib/hdb/hdb_locl.h                 |    4 +-
 source4/heimdal/lib/krb5/expand_path.c             |    2 +-
 source4/heimdal/lib/krb5/fcache.c                  |    2 +-
 source4/heimdal/lib/wind/gen-bidi.py               |    2 +-
 source4/heimdal/lib/wind/gen-combining.py          |    2 +-
 source4/heimdal/lib/wind/gen-errorlist.py          |    2 +-
 source4/heimdal/lib/wind/gen-normalize.py          |    2 +-
 source4/kdc/kdc.c                                  |    6 +-
 source4/ldap_server/ldap_server.c                  |    2 +-
 source4/lib/messaging/wscript_build                |    5 +-
 source4/lib/registry/tests/hive.c                  |    6 +-
 source4/libcli/wscript_build                       |    6 +-
 source4/librpc/wscript_build                       |    2 +-
 source4/nbt_server/dgram/netlogon.c                |    2 +-
 source4/nbt_server/register.c                      |    2 +-
 source4/ntvfs/cifs/vfs_cifs.c                      |   64 +-
 source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c      |   60 +-
 source4/ntvfs/ipc/vfs_ipc.c                        |   60 +-
 source4/ntvfs/nbench/vfs_nbench.c                  |   62 +-
 source4/ntvfs/ntvfs.h                              |   68 +-
 source4/ntvfs/ntvfs_generic.c                      |   54 +-
 source4/ntvfs/ntvfs_interface.c                    |  256 +-
 source4/ntvfs/posix/posix_eadb.c                   |    3 +-
 source4/ntvfs/posix/pvfs_sys.c                     |   23 +-
 source4/ntvfs/posix/vfs_posix.c                    |   62 +-
 source4/ntvfs/print/vfs_print.c                    |    8 +-
 source4/ntvfs/simple/vfs_simple.c                  |   60 +-
 source4/ntvfs/smb2/vfs_smb2.c                      |   62 +-
 source4/ntvfs/unixuid/vfs_unixuid.c                |   62 +-
 source4/param/tests/loadparm.c                     |    2 +-
 source4/rpc_server/backupkey/dcesrv_backupkey.c    |    2 +-
 source4/rpc_server/common/server_info.c            |    2 +-
 source4/rpc_server/lsa/dcesrv_lsa.c                |    4 +-
 source4/rpc_server/samr/dcesrv_samr.c              |    8 +-
 source4/scripting/python/samba/dbchecker.py        |    1 +
 source4/scripting/python/samba/netcmd/domain.py    |   19 +-
 .../scripting/python/samba/provision/__init__.py   |   65 +-
 source4/scripting/python/samba/samba3/__init__.py  |    3 +-
 source4/scripting/python/samba/tests/dns.py        |   79 +
 source4/scripting/python/samba/tests/hostconfig.py |    2 +-
 source4/scripting/python/samba/tests/param.py      |    4 +-
 source4/scripting/python/samba/tests/provision.py  |    7 +-
 .../python/samba/tests/samba_tool/timecmd.py       |    2 +-
 source4/scripting/python/samba/upgrade.py          |   47 +-
 source4/selftest/provisions/undump.sh              |   27 +-
 source4/selftest/tests.py                          |    4 +-
 source4/setup/provision                            |    3 -
 source4/setup/tests/blackbox_provision-backend.sh  |   10 +-
 source4/setup/tests/blackbox_s3upgrade.sh          |    9 +-
 source4/smb_server/smb/signing.c                   |    2 +-
 source4/smb_server/smb2/negprot.c                  |    2 +-
 source4/smbd/process_single.c                      |    2 +-
 source4/smbd/process_standard.c                    |    4 +-
 source4/smbd/server.c                              |    2 +-
 source4/torture/drs/python/drs_base.py             |    6 +-
 source4/torture/drs/python/replica_sync.py         |    6 +
 source4/torture/locktest.c                         |    2 +-
 source4/torture/ndr/ndr.c                          |    2 +-
 source4/torture/raw/lookuprate.c                   |    2 +-
 source4/torture/raw/notify.c                       |    4 +-
 source4/torture/raw/open.c                         |    4 +-
 source4/torture/raw/streams.c                      |    6 +-
 source4/torture/raw/unlink.c                       |    2 +-
 source4/torture/rpc/fsrvp.c                        |  571 +++
 source4/torture/rpc/rpc.c                          |    3 +-
 source4/torture/rpc/samr.c                         |    2 +-
 source4/torture/smb2/notify.c                      |    4 +-
 source4/torture/smb2/streams.c                     |    6 +-
 source4/torture/wscript_build                      |   12 +-
 source4/winbind/idmap.c                            |  149 +-
 source4/winbind/idmap.h                            |    1 +
 source4/winbind/wb_init_domain.c                   |    2 +-
 source4/winbind/wb_server.c                        |    7 +-
 source4/wscript_build                              |    2 +-
 testdata/samba3/wins.dat2                          |   23 +
 testprogs/blackbox/dbcheck-alpha13.sh              |   42 +
 testsuite/headers/wscript_build                    |    5 +
 wscript                                            |   14 +-
 wscript_build                                      |    3 +-
 wscript_configure_system_mitkrb5                   |   10 +-
 618 files changed, 29001 insertions(+), 43261 deletions(-)
 create mode 100644 lib/ccan/err/.depends
 create mode 100644 lib/ccan/err/_info
 create mode 100644 lib/ccan/err/err.c
 create mode 100644 lib/ccan/err/err.h
 create mode 100644 lib/ccan/err/test/run.c
 create mode 100644 lib/ntdb/ABI/ntdb-0.9.sigs
 rename lib/{tdb2 => ntdb}/LICENSE (100%)
 rename lib/{tdb2 => ntdb}/Makefile (100%)
 create mode 100644 lib/ntdb/check.c
 rename lib/{tdb2 => ntdb}/configure (100%)
 create mode 100644 lib/ntdb/doc/TDB_porting.txt
 create mode 100644 lib/ntdb/doc/design.lyx
 create mode 100644 lib/ntdb/doc/design.pdf
 create mode 100644 lib/ntdb/doc/design.txt
 create mode 100644 lib/ntdb/free.c
 create mode 100644 lib/ntdb/hash.c
 create mode 100644 lib/ntdb/io.c
 create mode 100644 lib/ntdb/libntdb.m4
 create mode 100644 lib/ntdb/lock.c
 create mode 100644 lib/ntdb/ntdb.c
 create mode 100644 lib/ntdb/ntdb.h
 create mode 100644 lib/ntdb/ntdb.pc.in
 create mode 100644 lib/ntdb/open.c
 create mode 100644 lib/ntdb/private.h
 create mode 100644 lib/ntdb/pyntdb.c
 create mode 100644 lib/ntdb/summary.c
 create mode 100644 lib/ntdb/test/api-12-store.c
 create mode 100644 lib/ntdb/test/api-13-delete.c
 create mode 100644 lib/ntdb/test/api-14-exists.c
 create mode 100644 lib/ntdb/test/api-16-wipe_all.c
 create mode 100644 lib/ntdb/test/api-20-alloc-attr.c
 create mode 100644 lib/ntdb/test/api-21-parse_record.c
 create mode 100644 lib/ntdb/test/api-55-transaction.c
 create mode 100644 lib/ntdb/test/api-80-tdb_fd.c
 create mode 100644 lib/ntdb/test/api-81-seqnum.c
 create mode 100644 lib/ntdb/test/api-82-lockattr.c
 create mode 100644 lib/ntdb/test/api-83-openhook.c
 create mode 100644 lib/ntdb/test/api-91-get-stats.c
 create mode 100644 lib/ntdb/test/api-92-get-set-readonly.c
 create mode 100644 lib/ntdb/test/api-93-repack.c
 create mode 100644 lib/ntdb/test/api-add-remove-flags.c
 create mode 100644 lib/ntdb/test/api-check-callback.c
 create mode 100644 lib/ntdb/test/api-firstkey-nextkey.c
 create mode 100644 lib/ntdb/test/api-fork-test.c
 create mode 100644 lib/ntdb/test/api-locktimeout.c
 create mode 100644 lib/ntdb/test/api-missing-entries.c
 create mode 100644 lib/ntdb/test/api-open-multiple-times.c
 create mode 100644 lib/ntdb/test/api-record-expand.c
 create mode 100644 lib/ntdb/test/api-simple-delete.c
 create mode 100644 lib/ntdb/test/api-summary.c
 create mode 100644 lib/ntdb/test/external-agent.c
 create mode 100644 lib/ntdb/test/external-agent.h
 create mode 100644 lib/ntdb/test/failtest_helper.c
 create mode 100644 lib/ntdb/test/failtest_helper.h
 create mode 100644 lib/ntdb/test/helpapi-external-agent.c
 create mode 100644 lib/ntdb/test/helprun-external-agent.c
 create mode 100644 lib/ntdb/test/helprun-layout.c
 create mode 100644 lib/ntdb/test/layout.h
 create mode 100644 lib/ntdb/test/lock-tracking.c
 rename lib/{tdb2 => ntdb}/test/lock-tracking.h (100%)
 create mode 100644 lib/ntdb/test/logging.c
 create mode 100644 lib/ntdb/test/logging.h
 create mode 100644 lib/ntdb/test/ntdb-source.h
 create mode 100644 lib/ntdb/test/run-001-encode.c
 create mode 100644 lib/ntdb/test/run-001-fls.c
 create mode 100644 lib/ntdb/test/run-01-new_database.c
 create mode 100644 lib/ntdb/test/run-02-expand.c
 create mode 100644 lib/ntdb/test/run-03-coalesce.c
 create mode 100644 lib/ntdb/test/run-04-basichash.c
 create mode 100644 lib/ntdb/test/run-05-readonly-open.c
 create mode 100644 lib/ntdb/test/run-10-simple-store.c
 create mode 100644 lib/ntdb/test/run-11-simple-fetch.c
 create mode 100644 lib/ntdb/test/run-12-check.c
 create mode 100644 lib/ntdb/test/run-15-append.c
 create mode 100644 lib/ntdb/test/run-25-hashoverload.c
 create mode 100644 lib/ntdb/test/run-30-exhaust-before-expand.c
 create mode 100644 lib/ntdb/test/run-35-convert.c
 create mode 100644 lib/ntdb/test/run-50-multiple-freelists.c
 create mode 100644 lib/ntdb/test/run-56-open-during-transaction.c
 create mode 100644 lib/ntdb/test/run-57-die-during-transaction.c
 create mode 100644 lib/ntdb/test/run-64-bit-tdb.c
 create mode 100644 lib/ntdb/test/run-90-get-set-attributes.c
 create mode 100644 lib/ntdb/test/run-capabilities.c
 create mode 100644 lib/ntdb/test/run-expand-in-transaction.c
 create mode 100644 lib/ntdb/test/run-features.c
 create mode 100644 lib/ntdb/test/run-lockall.c
 create mode 100644 lib/ntdb/test/run-remap-in-read_traverse.c
 create mode 100644 lib/ntdb/test/run-seed.c
 create mode 100644 lib/ntdb/test/run-tdb_errorstr.c
 create mode 100644 lib/ntdb/test/run-tdb_foreach.c
 create mode 100644 lib/ntdb/test/run-traverse.c
 rename lib/{tdb2 => ntdb}/test/tap-interface.c (100%)
 create mode 100644 lib/ntdb/test/tap-interface.h
 create mode 100644 lib/ntdb/tools/Makefile
 create mode 100644 lib/ntdb/tools/growtdb-bench.c
 create mode 100644 lib/ntdb/tools/mkntdb.c
 create mode 100644 lib/ntdb/tools/ntdbbackup.c
 create mode 100644 lib/ntdb/tools/ntdbdump.c
 create mode 100644 lib/ntdb/tools/ntdbrestore.c
 create mode 100644 lib/ntdb/tools/ntdbtool.c
 create mode 100644 lib/ntdb/tools/ntdbtorture.c
 create mode 100644 lib/ntdb/tools/speed.c
 create mode 100644 lib/ntdb/transaction.c
 create mode 100644 lib/ntdb/traverse.c
 create mode 100644 lib/ntdb/wscript
 delete mode 100644 lib/tdb2/ABI/tdb-2.0.0.sigs
 delete mode 100644 lib/tdb2/TODO
 delete mode 100644 lib/tdb2/_info
 delete mode 100644 lib/tdb2/check.c
 delete mode 100644 lib/tdb2/doc/TDB1_porting.txt
 delete mode 100644 lib/tdb2/doc/design-1.3.txt
 delete mode 100644 lib/tdb2/doc/design.lyx
 delete mode 100644 lib/tdb2/doc/design.lyx,v
 delete mode 100644 lib/tdb2/doc/design.pdf
 delete mode 100644 lib/tdb2/doc/design.txt
 delete mode 100644 lib/tdb2/free.c
 delete mode 100644 lib/tdb2/hash.c
 delete mode 100644 lib/tdb2/io.c
 delete mode 100644 lib/tdb2/lock.c
 delete mode 100644 lib/tdb2/open.c
 delete mode 100644 lib/tdb2/private.h
 delete mode 100644 lib/tdb2/pytdb.c
 delete mode 100644 lib/tdb2/summary.c
 delete mode 100644 lib/tdb2/tdb.c
 delete mode 100644 lib/tdb2/tdb.pc.in
 delete mode 100644 lib/tdb2/tdb1_check.c
 delete mode 100644 lib/tdb2/tdb1_freelist.c
 delete mode 100644 lib/tdb2/tdb1_hash.c
 delete mode 100644 lib/tdb2/tdb1_io.c
 delete mode 100644 lib/tdb2/tdb1_lock.c
 delete mode 100644 lib/tdb2/tdb1_open.c
 delete mode 100644 lib/tdb2/tdb1_private.h
 delete mode 100644 lib/tdb2/tdb1_summary.c
 delete mode 100644 lib/tdb2/tdb1_tdb.c
 delete mode 100644 lib/tdb2/tdb1_transaction.c
 delete mode 100644 lib/tdb2/tdb1_traverse.c
 delete mode 100644 lib/tdb2/tdb2.h
 delete mode 100644 lib/tdb2/test/api-12-store.c
 delete mode 100644 lib/tdb2/test/api-13-delete.c
 delete mode 100644 lib/tdb2/test/api-14-exists.c
 delete mode 100644 lib/tdb2/test/api-16-wipe_all.c
 delete mode 100644 lib/tdb2/test/api-21-parse_record.c
 delete mode 100644 lib/tdb2/test/api-55-transaction.c
 delete mode 100644 lib/tdb2/test/api-80-tdb_fd.c
 delete mode 100644 lib/tdb2/test/api-81-seqnum.c
 delete mode 100644 lib/tdb2/test/api-82-lockattr.c
 delete mode 100644 lib/tdb2/test/api-83-openhook.c
 delete mode 100644 lib/tdb2/test/api-91-get-stats.c
 delete mode 100644 lib/tdb2/test/api-92-get-set-readonly.c
 delete mode 100644 lib/tdb2/test/api-93-repack.c
 delete mode 100644 lib/tdb2/test/api-add-remove-flags.c
 delete mode 100644 lib/tdb2/test/api-check-callback.c
 delete mode 100644 lib/tdb2/test/api-firstkey-nextkey.c
 delete mode 100644 lib/tdb2/test/api-fork-test.c
 delete mode 100644 lib/tdb2/test/api-locktimeout.c
 delete mode 100644 lib/tdb2/test/api-missing-entries.c
 delete mode 100644 lib/tdb2/test/api-open-multiple-times.c
 delete mode 100644 lib/tdb2/test/api-record-expand.c
 delete mode 100644 lib/tdb2/test/api-simple-delete.c
 delete mode 100644 lib/tdb2/test/api-summary.c
 delete mode 100644 lib/tdb2/test/api-tdb1-flag-removal.c
 delete mode 100644 lib/tdb2/test/external-agent.c
 delete mode 100644 lib/tdb2/test/external-agent.h
 delete mode 100644 lib/tdb2/test/failtest_helper.c
 delete mode 100644 lib/tdb2/test/failtest_helper.h
 delete mode 100644 lib/tdb2/test/helpapi-external-agent.c
 delete mode 100644 lib/tdb2/test/helprun-external-agent.c
 delete mode 100644 lib/tdb2/test/helprun-layout.c
 delete mode 100644 lib/tdb2/test/jenkins-be-hash.tdb1
 delete mode 100644 lib/tdb2/test/jenkins-le-hash.tdb1
 delete mode 100644 lib/tdb2/test/layout.h
 delete mode 100644 lib/tdb2/test/lock-tracking.c
 delete mode 100644 lib/tdb2/test/logging.c
 delete mode 100644 lib/tdb2/test/logging.h
 delete mode 100644 lib/tdb2/test/old-nohash-be.tdb1
 delete mode 100644 lib/tdb2/test/old-nohash-le.tdb1
 delete mode 100644 lib/tdb2/test/run-001-encode.c
 delete mode 100644 lib/tdb2/test/run-001-fls.c
 delete mode 100644 lib/tdb2/test/run-01-new_database.c
 delete mode 100644 lib/tdb2/test/run-02-expand.c
 delete mode 100644 lib/tdb2/test/run-03-coalesce.c
 delete mode 100644 lib/tdb2/test/run-04-basichash.c
 delete mode 100644 lib/tdb2/test/run-05-readonly-open.c
 delete mode 100644 lib/tdb2/test/run-10-simple-store.c
 delete mode 100644 lib/tdb2/test/run-11-simple-fetch.c
 delete mode 100644 lib/tdb2/test/run-12-check.c
 delete mode 100644 lib/tdb2/test/run-15-append.c
 delete mode 100644 lib/tdb2/test/run-20-growhash.c
 delete mode 100644 lib/tdb2/test/run-25-hashoverload.c
 delete mode 100644 lib/tdb2/test/run-30-exhaust-before-expand.c
 delete mode 100644 lib/tdb2/test/run-35-convert.c
 delete mode 100644 lib/tdb2/test/run-50-multiple-freelists.c
 delete mode 100644 lib/tdb2/test/run-56-open-during-transaction.c
 delete mode 100644 lib/tdb2/test/run-57-die-during-transaction.c
 delete mode 100644 lib/tdb2/test/run-64-bit-tdb.c
 delete mode 100644 lib/tdb2/test/run-90-get-set-attributes.c
 delete mode 100644 lib/tdb2/test/run-capabilities.c
 delete mode 100644 lib/tdb2/test/run-expand-in-transaction.c
 delete mode 100644 lib/tdb2/test/run-features.c
 delete mode 100644 lib/tdb2/test/run-lockall.c
 delete mode 100644 lib/tdb2/test/run-remap-in-read_traverse.c
 delete mode 100644 lib/tdb2/test/run-seed.c
 delete mode 100644 lib/tdb2/test/run-tdb1-3G-file.c
 delete mode 100644 lib/tdb2/test/run-tdb1-bad-tdb-header.c
 delete mode 100644 lib/tdb2/test/run-tdb1-check.c
 delete mode 100644 lib/tdb2/test/run-tdb1-corrupt.c
 delete mode 100644 lib/tdb2/test/run-tdb1-endian.c
 delete mode 100644 lib/tdb2/test/run-tdb1-hashsize.c
 delete mode 100644 lib/tdb2/test/run-tdb1-incompatible.c
 delete mode 100644 lib/tdb2/test/run-tdb1-nested-transactions.c
 delete mode 100644 lib/tdb2/test/run-tdb1-nested-traverse.c
 delete mode 100644 lib/tdb2/test/run-tdb1-no-lock-during-traverse.c
 delete mode 100644 lib/tdb2/test/run-tdb1-oldhash.c
 delete mode 100644 lib/tdb2/test/run-tdb1-readonly-check.c
 delete mode 100644 lib/tdb2/test/run-tdb1-rwlock-check.c
 delete mode 100644 lib/tdb2/test/run-tdb1-seqnum-wrap.c
 delete mode 100644 lib/tdb2/test/run-tdb1-summary.c
 delete mode 100644 lib/tdb2/test/run-tdb1-traverse-in-transaction.c
 delete mode 100644 lib/tdb2/test/run-tdb1-wronghash-fail.c
 delete mode 100644 lib/tdb2/test/run-tdb1-zero-append.c
 delete mode 100644 lib/tdb2/test/run-tdb1.c
 delete mode 100644 lib/tdb2/test/run-tdb_errorstr.c
 delete mode 100644 lib/tdb2/test/run-tdb_foreach.c
 delete mode 100644 lib/tdb2/test/run-traverse.c
 delete mode 100644 lib/tdb2/test/rwlock-be.tdb1
 delete mode 100644 lib/tdb2/test/rwlock-le.tdb1
 delete mode 100644 lib/tdb2/test/tap-interface.h
 delete mode 100644 lib/tdb2/test/tdb1-external-agent.c
 delete mode 100644 lib/tdb2/test/tdb1-external-agent.h
 delete mode 100644 lib/tdb2/test/tdb1-lock-tracking.c
 delete mode 100644 lib/tdb2/test/tdb1-lock-tracking.h
 delete mode 100644 lib/tdb2/test/tdb1.corrupt
 delete mode 100644 lib/tdb2/test/tdb2-source.h
 delete mode 100644 lib/tdb2/tools/Makefile
 delete mode 100644 lib/tdb2/tools/growtdb-bench.c
 delete mode 100644 lib/tdb2/tools/mktdb2.c
 delete mode 100644 lib/tdb2/tools/speed.c
 delete mode 100644 lib/tdb2/tools/tdb2backup.c
 delete mode 100644 lib/tdb2/tools/tdb2dump.c
 delete mode 100644 lib/tdb2/tools/tdb2restore.c
 delete mode 100644 lib/tdb2/tools/tdb2tool.c
 delete mode 100644 lib/tdb2/tools/tdb2torture.c
 delete mode 100644 lib/tdb2/transaction.c
 delete mode 100644 lib/tdb2/traverse.c
 delete mode 100644 lib/tdb2/wscript
 create mode 100644 lib/tevent/ABI/tevent-0.9.16.sigs
 mode change 100644 => 100755 lib/tevent/wscript
 create mode 100644 librpc/idl/fsrvp.idl
 delete mode 100644 source3/auth/auth_netlogond.c
 create mode 100644 source3/autoconf/lib/param/README
 create mode 100644 source3/autoconf/source3/param/README
 create mode 100644 source3/lib/conn_tdb.h
 create mode 100644 source3/lib/pthreadpool/pthreadpool_sync.c
 create mode 100644 source3/libsmb/ABI/smbclient-0.2.0.sigs
 delete mode 100644 source3/passdb/pdb_ads.c
 create mode 100644 source3/rpcclient/cmd_fss.c
 create mode 100644 source4/torture/rpc/fsrvp.c
 create mode 100644 testdata/samba3/wins.dat2
 create mode 100755 testprogs/blackbox/dbcheck-alpha13.sh


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index b18a6d1..7f2c590 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,13 +90,13 @@ source3/script/installbin.sh
 source3/script/uninstallbin.sh
 source3/smbadduser
 source3/smbd/build_options.c
-source3/param/param_global.h
-source3/param/param_local.h
+source3/autoconf/source3/param/param_global.h
+source3/autoconf/source3/param/param_local.h
 source3/setup
-lib/param/param_global.h
-lib/param/param_local.h
-lib/param/param_proto.h
-lib/param/s3_param.h
+source3/autoconf/lib/param/param_global.h
+source3/autoconf/lib/param/param_local.h
+source3/autoconf/lib/param/param_proto.h
+source3/autoconf/lib/param/s3_param.h
 pidl/blib
 pidl/cover_db
 pidl/Makefile
diff --git a/VERSION b/VERSION
index 7738efa..7d85cf3 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=1
+SAMBA_VERSION_BETA_RELEASE=2
 
 ########################################################
 # For 'pre' releases the version will be               #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index cb35f08..c4ba7f3 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,4 @@
-What's new in Samba 4 beta1
+What's new in Samba 4 beta2
 =============================
 
 Samba 4.0 will be the next version of the Samba suite and incorporates
@@ -11,7 +11,7 @@ and above.
 WARNINGS
 ========
 
-Samba4 beta1 is not a final Samba release, however we are now making
+Samba4 beta2 is not a final Samba release, however we are now making
 good progress towards a Samba 4.0 release, of which this is a preview.
 Be aware the this release contains the best of all of Samba's
 technology parts, both a file server (that you can reasonably expect
@@ -28,13 +28,26 @@ different stability characteristics compared with our previous default
 file server.  We are making this release so that we can find and fix
 any of these issues that arise in the real world.  New AD DC
 installations can provision or join with --use-ntvfs to obtain the
-previous default file server.  Existing installations will be
-unaffected at this stage.
+previous default file server.  See below how to continue using ntvfs
+in an existing installation.
 
 If you are upgrading, or looking to develop, test or deploy Samba 4.0
 beta releases, you should backup all configuration and data.
 
 
+UPGRADING
+=========
+
+Users upgrading from Samba 3.x domain controllers and wanting to use
+Samba 4.0 as an AD DC should use the 'samba-tool domain
+classicupgrade' command.  See the wiki for more details:
+https://wiki.samba.org/index.php/Samba4/samba3upgrade/HOWTO 
+
+Users upgrading from Samba 4.0 alpha and beta releases since alpha15 
+should run 'samba-tool dbcheck --cross-ncs --fix'.  Users upgrading
+from earlier alpha releases should contact the team for advice. 
+
+
 NEW FEATURES
 ============
 
@@ -81,41 +94,50 @@ 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 alpha21
+CHANGES SINCE beta1
 =====================
 
-For a list of changes since alpha21, please see the git log.
+For a list of changes since beta1, please see the git log.
 
 $ git clone git://git.samba.org/samba.git
 $ cd samba.git
-$ git log samba-4.0.0alpha21..samba-4.0.0beta1
+$ git log samba-4.0.0beta1..samba-4.0.0beta2
 
 Some major user-visible changes include:
 
-The internal DNS server has had some stability improvements, and
-now handles forwarded DNS replies in an async manner.
+The default file server for EXISTING USERS has changed to s3fs.  To
+continue to use ntvfs, you must set in your smb.conf:
+
+    server services = +smb -s3fs
+    dcerpc endpoint servers = +winreg +srvsvc
+
+samba-tool dbcheck will now upgrade older databases that are missing
+GUIDs in the schema partition.  
+
+The 'samba-tool domain samba3upgrade' command is now called
+'samba-tool domain classicupgrade' and now creates users and groups
+with the posixAccount objectClass and uidNumber and gidNumber values.
 
-The build of libtdb.so and libtalloc.so has been removed from the
-autoconf build.  Use the build in lib/talloc and lib/tdb to build
-this software for use across the system.
+The new 'idmap_ldb:use rfc2307' parameter allows these values to be
+used instead of the idmap.ldb, where found in the directory.
 
-The smbclient and nmblookup binaries have been renamed in the top
-level build, so smbclient/nmblookup are now the implementations from
-the Samba 3.x heritage.
+Work has continued to make Samba more portable to a wide variety of
+Unix-like systems, and to support --without-ad-dc on systems lacking a
+modern MIT krb5.
 
-Improved handling of the cleanup of smbd child processes (removing a
-number of scary warnings from our log output).
+Less visible, but very importantly, the work has continued in restructuring
+the smbd file server to implement SMB3.
 
-Much improved support for FreeBSD, including extended attribute
-support on the filesystem for the AD DC.
+The TDB2 database library has been changed to ntdb, but will not be
+the default db layer for the 4.0 release.  We will continue to use tdb1.
 
 
 KNOWN ISSUES
 ============
 
-- We are making this beta release to gain real-world use of the 's3fs'
+- This release makes the s3fs file server the default, as this is the
   file server combination we will use for the Samba 4.0 release.
-  Users should expect some rough edges: in particular, there are
+  Users should still expect some rough edges: in particular, there are
   warnings about invalid parameters from the two respective parameter
   parsing engines.
 
diff --git a/auth/kerberos/gssapi_pac.c b/auth/kerberos/gssapi_pac.c
index dadae1a..a174052 100644
--- a/auth/kerberos/gssapi_pac.c
+++ b/auth/kerberos/gssapi_pac.c
@@ -80,8 +80,24 @@ NTSTATUS gssapi_obtain_pac_blob(TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	OM_uint32 gss_maj, gss_min;
 #ifdef HAVE_GSS_GET_NAME_ATTRIBUTE
-	gss_buffer_desc pac_buffer;
-	gss_buffer_desc pac_display_buffer;
+/*
+ * gss_get_name_attribute() in MIT krb5 1.10.0 can return unintialized pac_display_buffer
+ * and later gss_release_buffer() will crash on attempting to release it.
+ *
+ * So always initialize the buffer descriptors.
+ *
+ * See following links for more details:
+ * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658514
+ * http://krbdev.mit.edu/rt/Ticket/Display.html?user=guest&pass=guest&id=7087
+ */
+	gss_buffer_desc pac_buffer = {
+		.value = NULL,
+		.length = 0
+	};
+	gss_buffer_desc pac_display_buffer = {
+		.value = NULL,
+		.length = 0
+	};
 	gss_buffer_desc pac_name = {
 		.value = discard_const("urn:mspac:"),
 		.length = sizeof("urn:mspac:")-1
diff --git a/buildtools/update-waf.sh b/buildtools/update-waf.sh
index c368f5a..277111f 100755
--- a/buildtools/update-waf.sh
+++ b/buildtools/update-waf.sh
@@ -2,7 +2,7 @@
 # Update our copy of waf
 
 TARGETDIR="`dirname $0`"
-WORKDIR="`mktemp -d -t update-waf`"
+WORKDIR="`mktemp -d -t update-waf-XXXXXX`"
 
 mkdir -p "$WORKDIR"
 
diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py
index 4f73081..511cf09 100644
--- a/buildtools/wafadmin/Tools/python.py
+++ b/buildtools/wafadmin/Tools/python.py
@@ -6,9 +6,9 @@
 "Python support"
 
 import os, sys
-import TaskGen, Utils, Utils, Runner, Options, Build
+import TaskGen, Utils, Options
 from Logs import debug, warn, info
-from TaskGen import extension, taskgen, before, after, feature
+from TaskGen import extension, before, after, feature
 from Configure import conf
 
 EXT_PY = ['.py']
@@ -173,7 +173,7 @@ def check_python_headers(conf, mandatory=True):
 		(python_prefix, python_SO, python_SYSLIBS, python_LDFLAGS, python_SHLIBS,
 		 python_LIBDIR, python_LIBPL, INCLUDEPY, Py_ENABLE_SHARED,
 		 python_MACOSX_DEPLOYMENT_TARGET) = \
-			_get_python_variables(python, ["get_config_var('%s')" % x for x in v],
+			_get_python_variables(python, ["get_config_var('%s') or ''" % x for x in v],
 					      ['from distutils.sysconfig import get_config_var'])
 	except RuntimeError:
 		conf.fatal("Python development headers not found (-v for details).")
@@ -310,7 +310,7 @@ def check_python_version(conf, minver=None):
 	# Get python version string
 	cmd = [python, "-c", "import sys\nfor x in sys.version_info: print(str(x))"]
 	debug('python: Running python command %r' % cmd)
-	proc = Utils.pproc.Popen(cmd, stdout=Utils.pproc.PIPE)
+	proc = Utils.pproc.Popen(cmd, stdout=Utils.pproc.PIPE, shell=False)
 	lines = proc.communicate()[0].split()
 	assert len(lines) == 5, "found %i lines, expected 5: %r" % (len(lines), lines)
 	pyver_tuple = (int(lines[0]), int(lines[1]), int(lines[2]), lines[3], int(lines[4]))
@@ -329,14 +329,14 @@ def check_python_version(conf, minver=None):
 			if sys.platform == 'win32':
 				(python_LIBDEST, pydir) = \
 						_get_python_variables(python,
-											  ["get_config_var('LIBDEST')",
-											   "get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']],
+											  ["get_config_var('LIBDEST') or ''",
+											   "get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']],
 											  ['from distutils.sysconfig import get_config_var, get_python_lib'])
 			else:
 				python_LIBDEST = None
 				(pydir,) = \
 						_get_python_variables(python,
-											  ["get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']],
+											  ["get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']],
 											  ['from distutils.sysconfig import get_config_var, get_python_lib'])
 			if python_LIBDEST is None:
 				if conf.env['LIBDIR']:
@@ -348,7 +348,7 @@ def check_python_version(conf, minver=None):
 			pyarchdir = conf.environ['PYTHONARCHDIR']
 		else:
 			(pyarchdir,) = _get_python_variables(python,
-											["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r)" % conf.env['PREFIX']],
+											["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']],
 											['from distutils.sysconfig import get_config_var, get_python_lib'])
 			if not pyarchdir:
 				pyarchdir = pydir
@@ -390,8 +390,10 @@ def detect(conf):
 	if not python:
 		conf.fatal('Could not find the path of the python executable')
 
-	v = conf.env
+	if conf.env.PYTHON != sys.executable:
+		warn("python executable '%s' different from sys.executable '%s'" % (conf.env.PYTHON, sys.executable))
 
+	v = conf.env
 	v['PYCMD'] = '"import sys, py_compile;py_compile.compile(sys.argv[1], sys.argv[2])"'
 	v['PYFLAGS'] = ''
 	v['PYFLAGS_OPT'] = '-O'
diff --git a/buildtools/wafsamba/irixcc.py b/buildtools/wafsamba/irixcc.py
index a7b0a74..f29f9a0 100644
--- a/buildtools/wafsamba/irixcc.py
+++ b/buildtools/wafsamba/irixcc.py
@@ -17,7 +17,9 @@ def find_irixcc(conf):
     cc = None
     if v['CC']: cc = v['CC']
     elif 'CC' in conf.environ: cc = conf.environ['CC']
-    if not cc: cc = conf.find_program('cc', var='CC')
+    if not cc:
+        cc = conf.find_program('cc', var='CC')
+        cc += ' -c99'
     if not cc: conf.fatal('irixcc was not found')
     cc = conf.cmd_to_list(cc)
 
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index b6a9f1b..476d8fc 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -61,18 +61,11 @@ def s3_fix_kwargs(bld, kwargs):
                             '../source4/heimdal_build',
                             '../bin/default/source4/heimdal/lib/asn1' ]
 
-    if bld.CONFIG_SET('BUILD_TDB2'):
-        if bld.CONFIG_SET('USING_SYSTEM_TDB2'):
-            (tdb2_includes, tdb2_ldflags, tdb2_cpppath) = library_flags(bld, 'tdb')
-            extra_includes += tdb2_cpppath
-        else:
-            extra_includes += [ '../lib/tdb2' ]
+    if bld.CONFIG_SET('USING_SYSTEM_TDB'):
+        (tdb_includes, tdb_ldflags, tdb_cpppath) = library_flags(bld, 'tdb')
+        extra_includes += tdb_cpppath
     else:
-        if bld.CONFIG_SET('USING_SYSTEM_TDB'):
-            (tdb_includes, tdb_ldflags, tdb_cpppath) = library_flags(bld, 'tdb')
-            extra_includes += tdb_cpppath
-        else:
-            extra_includes += [ '../lib/tdb/include' ]
+        extra_includes += [ '../lib/tdb/include' ]
 
     if bld.CONFIG_SET('USING_SYSTEM_TEVENT'):
         (tevent_includes, tevent_ldflags, tevent_cpppath) = library_flags(bld, 'tevent')
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 4da5df8..be5e926 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -467,7 +467,16 @@ def CONFIG_GET(conf, option):
 @conf
 def CONFIG_SET(conf, option):
     '''return True if a configuration option was found'''
-    return (option in conf.env) and (conf.env[option] != ())
+    if option not in conf.env:
+        return False
+    v = conf.env[option]
+    if v == None:
+        return False
+    if v == []:
+        return False
+    if v == ():
+        return False
+    return True
 Build.BuildContext.CONFIG_SET = CONFIG_SET
 Build.BuildContext.CONFIG_GET = CONFIG_GET
 
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index 3605e33..0274f66 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -113,6 +113,14 @@ def CHECK_LARGEFILE(conf, define='HAVE_LARGEFILE'):
                        msg='Checking for -D_FILE_OFFSET_BITS=64'):
         conf.DEFINE('_FILE_OFFSET_BITS', 64)
         return True
+
+    if conf.CHECK_CODE('return !(sizeof(off_t) >= 8)',
+                       define,
+                       execute=True,
+                       cflags='-D_LARGE_FILES',
+                       msg='Checking for -D_LARGE_FILES'):
+        conf.DEFINE('_LARGE_FILES', 1)
+        return True
     return False
 
 
diff --git a/dfs_server/dfs_server_ad.c b/dfs_server/dfs_server_ad.c
index b7004c5..6b71f70 100644
--- a/dfs_server/dfs_server_ad.c
+++ b/dfs_server/dfs_server_ad.c
@@ -447,7 +447,7 @@ static NTSTATUS dodomain_referral(struct loadparm_context *lp_ctx,
 	/* In the future this needs to be fetched from the ldb */
 	uint32_t found_domain = 2;
 
-	if (lpcfg_server_role(lp_ctx) != ROLE_DOMAIN_CONTROLLER) {
+	if (lpcfg_server_role(lp_ctx) != ROLE_ACTIVE_DIRECTORY_DC) {
 		DEBUG(10 ,("Received a domain referral request on a non DC\n"));
 		return NT_STATUS_INVALID_PARAMETER;
 	}
@@ -529,7 +529,7 @@ static NTSTATUS dodc_referral(struct loadparm_context *lp_ctx,
 	struct dfs_referral_type *referrals;
 	const char *referral_str;
 
-	if (lpcfg_server_role(lp_ctx) != ROLE_DOMAIN_CONTROLLER) {
+	if (lpcfg_server_role(lp_ctx) != ROLE_ACTIVE_DIRECTORY_DC) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
@@ -640,7 +640,7 @@ static NTSTATUS dosysvol_referral(struct loadparm_context *lp_ctx,
 	NTSTATUS status;
 	struct dfs_referral_type *referrals;
 
-	if (lpcfg_server_role(lp_ctx) != ROLE_DOMAIN_CONTROLLER) {
+	if (lpcfg_server_role(lp_ctx) != ROLE_ACTIVE_DIRECTORY_DC) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 7f2b4a7..f20afb2 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -686,7 +686,7 @@ net groupmap add {rid=int|sid=string} unixgroup=string \
 <refsect3>
 <title>GROUPMAP MODIFY</title>
 
-<para>Update en existing group entry.</para>
+<para>Update an existing group entry.</para>
 
 <para>
 <programlisting>
diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages-3/rpcclient.1.xml
index 275acf9..4e3d30c 100644
--- a/docs-xml/manpages-3/rpcclient.1.xml
+++ b/docs-xml/manpages-3/rpcclient.1.xml
@@ -427,6 +427,51 @@ Comma Separated list of Files
 	</refsect2>
 
 	<refsect2>
+	<title>FSRVP</title>
+	<variablelist>
+
+	<varlistentry><term>fss_is_path_sup</term>
+		<listitem>
+			<para>Check whether a share supports shadow-copy
+			requests</para>
+		</listitem>
+	</varlistentry>
+	<varlistentry><term>fss_get_sup_version</term>
+		<listitem>
+			<para>Get supported FSRVP version from server</para>
+		</listitem>
+	</varlistentry>
+	<varlistentry><term>fss_create_expose</term>
+		<listitem>
+			<para>Request shadow-copy creation and exposure</para>
+		</listitem>
+	</varlistentry>
+	<varlistentry><term>fss_delete</term>
+		<listitem>
+			<para>Request shadow-copy share deletion</para>
+	</listitem>
+	</varlistentry>
+	<varlistentry><term>fss_has_shadow_copy</term>
+		<listitem>
+			<para>Check for an associated share shadow-copy</para>
+		</listitem>
+	</varlistentry>
+	<varlistentry><term>fss_get_mapping</term>
+		<listitem>
+			<para>Get shadow-copy share mapping information</para>
+		</listitem>
+	</varlistentry>
+	<varlistentry><term>fss_recovery_complete</term>
+		<listitem>
+			<para>Flag read-write snapshot as recovery complete,
+			allowing further shadow-copy requests</para>
+		</listitem>
+	</varlistentry>
+
+	</variablelist>
+	</refsect2>
+
+	<refsect2>
 	<title>GENERAL COMMANDS</title>
 
 	<variablelist>
diff --git a/docs-xml/manpages-3/vfs_gpfs.8.xml b/docs-xml/manpages-3/vfs_gpfs.8.xml
index 3635143..526d86d 100644
--- a/docs-xml/manpages-3/vfs_gpfs.8.xml
+++ b/docs-xml/manpages-3/vfs_gpfs.8.xml
@@ -50,6 +50,8 @@
 
 	<para>This module is stackable.</para>
 
+	<para>Since Samba 4.0 all options are per share options.</para>
+
 </refsect1>
 
 
@@ -174,7 +176,7 @@
 		<listitem>
 		<para>
 		GPFS ACLs doesn't know about the 'APPEND' right.
-		This optionen lets Samba map the 'APPEND' right to 'WRITE'.
+		This option lets Samba map the 'APPEND' right to 'WRITE'.
 		</para>
 
 		<itemizedlist>
@@ -190,6 +192,26 @@
 		</varlistentry>
 		<varlistentry>
 
+		<term>gpfs:acl = [ yes | no ]</term>
+		<listitem>
+		<para>
+		This option lets Samba use or ignore GPFS ACLs.
+		</para>
+
+		<itemizedlist>
+		<listitem><para>
+		<command>yes(default)</command> - use GPFS ACLs.
+		</para></listitem>
+		<listitem><para>
+		<command>no</command> - do not use GPFS ACLs and pass everything
+		to the next SMB_VFS module.
+		</para></listitem>
+		</itemizedlist>
+		</listitem>
+
+		</varlistentry>
+		<varlistentry>
+
 		<term>gpfs:refuse_dacl_protected = [ yes | no ]</term>


-- 
Samba Shared Repository


More information about the samba-cvs mailing list