[SCM] Samba Shared Repository - branch v3-5-stable updated

[Karolin Seeger]

The branch, v3-5-stable has been updated
       via  e3bcc3e... create-tarball: Make it more comfortable to use the --copy-docs option.
       via  8b6b509... Fix warnings with talloc_asprintf. Jeremy. (cherry picked from commit c5b234c9cde079aa45ed93c42b5ed5e66ac969a3) (cherry picked from commit ebd6a9fb8fd510a7998867c6ea19b0b690f1a402)
       via  4d730ad... Make us pass RAW-CHKPATH with a case sensitive share. I know Volker will look at this closely so here's the explaination :-). Originally on a case-sensitive share we simply did a stat (or lstat) call and returned success of fail based on the result. However this failed to take account of incoming paths with a wildcard (which must always fail, and with different error messages depending on whether the wildcard is the last component or in the path). Also it failed to take account of a stat fail with ENOENT due to a missing component of the path as the last component (which is ok as it could be a new file)  or if the ENOENT was due to the missing component within the path (not the last component) - which must return the correct error. What this means is that with "case sensitive = yes" we do one more talloc call (to get the parent directory) and one more stat call (on the parent directory) in the case where the stat call fails. I think this is an acceptabl
 e overhead to enable case sensitive shares to return the correct error messages for applications. Volker please examine carefully :-). Jeremy. (cherry picked from commit c96d487ae3c65c17b377bb316adac4b5775448f3) (cherry picked from commit 00478458b56a0eea52e08605f9f1746abe22109f)
       via  127c014... Add RAW-CHKPATH test with case-sensitive share. Jeremy. (cherry picked from commit 108da2adaf77c152fd292bbdf5645923659a7c2c) (cherry picked from commit d99584e5cd2edd382236f1b083e7274428dfe3ac)
       via  17379a0... s3-registry: fix REG_MULTI_SZ handling in registry_push_value.
       via  752ee6f... s3-kerberos: add check for prerequisite krb5/krb5.h header while checking for krb5/locate_plugin.h.
       via  792fb3b... nsswitch: fix compile of winbind_krb5_locator with recent Heimdal versions.
       via  d1253d9... cifs.upcall: 2nd part of fix for Bug #6868: support building with Heimdal we well as with MIT.
       via  d06511b... s3-spoolss: re-arrange driver info level fillup functions.
       via  748ffac... s3-spoolss: fixes for _spoolss_EnumPrinterKey client and server.
       via  8199e4a... s3-registry: use push_reg_multi_sz() in registry_push_value().
       via  160d4fa... s3-registry: remove reg_pull_multi_sz().
       via  f160e48... Fix bug 6892 - When a chown operation is issued via Windows Explorer, all ACLS are wiped out. Merges existing DACLs when a ACL set operation comes in with only owner or group values set. Jeremy. (cherry picked from commit 7ed6f9f0960885366800b1ca2ce9558414b62d54) (cherry picked from commit db4fd2b1d351be42978c48c2f5cfc61ee50ecebc)
       via  285d6ba... Fix crash due to uninitialized pointer (not a problem in 3.4.x or below). Jeremy. (cherry picked from commit 947c47f2819ff30d3c69bfbeb4b1932467b36cce) (cherry picked from commit 6a13107da7b1563b3bdccd66c2d7c369db7c2bb4)
       via  61a2b59... Remove call into reduce_name if case sensitive. This allows us to pass RAW-CHKPATH when case sensitive = yes, but isn't the correct way to do it. I'm testing a larger patch to smbd/filename.c that should fix this correctly, and will add a torture test to ensure RAW-CHKPATH is run against a case sensitive share once this is done. Jeremy. (cherry picked from commit 1ad23832cfafd46f83ac406006ff175900b81d00) (cherry picked from commit bec9ed47c8f543d44cdc0f4bb8302356ca5dc969)
       via  cf18a88... Allow us to pass RAW-CHKPATH with FILE_FLAG_POSIX_SEMANTICS set or with wide links = no. Jeremy. (cherry picked from commit b2dd546f01425ff17008d3b0b0c36f754e6f3eec) (cherry picked from commit ecae8be35c745d769ae727505d62fa8c5e57dca4)
       via  b9f8a79... Fix make test. Only do POSIX case conversion if FILE_FLAG_POSIX_SEMANTICS set. Doh ! Jeremy. (cherry picked from commit 187ef6b482273244d3b5b716881ab7b5d328cbc1) (cherry picked from commit b8c7631107cb87e6f9984d2e637d96ce1c0e83eb)
       via  08b3603... s3: Always try SamLogonEx
       via  b848dcf... docs: Fix Bug 6922: Add Registry patchfile for Win7 domain join.
       via  76d8108... s3-spoolss: Fix GetPrinter level 101.
       via  1aa722b... s4-smbtorture: fix spoolss_EnumPrinterKey client in RPC-SPOOLSS-WIN.
       via  3ad562c... s3-printing: remove duplicate code while cleaning up driver structs.
       via  033e59d... Restore NtCreateX case handling with FILE_FLAG_POSIX_SEMANTICS to the way it worked in 3.3.x and 3.2.x. UCF_POSIX_PATHNAMES may no longer be needed, as lp_posix_pathnames() being set isn't the same as case handling from NtCreateX (lp_posix_pathnames() changes the STAT calls to LSTAT, not the case semantics). Jeremy. (cherry picked from commit a930e3e4e140a133cb2ab59d20bda9e04b93cd7a) (cherry picked from commit 3de925c3b74802b1f6b9b43e3c175fa2fb332182)
       via  e06cf2a... Remove unused code. Jeremy. (cherry picked from commit 4b8859840be2aacc90a2779820e08a09c793df3b) (cherry picked from commit d87c26171b757c3a0471edac4fb982c3f8d0dc35)
       via  a5b2f93... Proper fix for #6898 - Samba duplicates file content on appending. Pointed out by Volker.Restores the pathname handling for FILE_FLAG_POSIX_SEMANTICS but still prevents the O_APPEND problems. Jeremy. (cherry picked from commit f8bd0559ada056722d7d5ae0286753e7c591650b) (cherry picked from commit 45bbbb04fb9a8ff8eaa3b64c8cae42c5b8a77027)
       via  d03e892... Fix bug #6898 - Samba duplicates file content on appending Clients using a Windows open call should not be able to set FILE_FLAG_POSIX_SEMANTICS in an open. Jeremy. (cherry picked from commit 7ebe5b16416a3a09ff8840ab84079fde022a957c) (cherry picked from commit b0fc15e36714302cd398c4da52673fd1b4361fba)
       via  677231d... s3-winbind: In _wbint_CheckMachineAccount, there is only one child domain ever (cherry picked from commit 7009361f391176c8e9e3a6fac3fbf5d7dab7fcb9)
       via  6338bc3... s3: Move a variable declaration to its only use (cherry picked from commit e6e439f0a4d6d1b9ffb9c5b055f5fecec3259795)
       via  9b939e1... s3-spoolss: move more defines out of nt_printing.h to spoolss.idl where they belong.
       via  961555f... s3-printing: remove unused NT_PRINTER_DRIVER_INFO_LEVEL structs.
       via  17db77b... s3-printing: use spoolss types and structs while getting and deleting drivers.
       via  70e4af4... s3-printing: use spoolss types and structs while adding drivers.
       via  f34ef13... s4-smbtorture: add tests for spoolss_EnumPrinterKey to RPC-SPOOLSS-PRINTER.
       via  221556f... s3-spoolss: fix spoolss_EnumPrinterKey client and server code.
       via  f661590... spoolss: fix spoolss_EnumPrinterKey IDL.
       via  1574361... s3-build: delete more object files for "make clean".
       via  49b9578... s3-build: really fix build of winbind_krb5_locator.
       via  37ab47d... s3-build: make sure to remove libds and client object files on make clean.
       via  dd78129... s3-rpcclient: use the parsed binding string flags for auth choice.
       via  3746053... s3: Fix bug 6338 -- net rpc trustdom list always display "none" (cherry picked from commit 3fcf1a8f9c369f1181f749d2ec9f214df493e3ab)
       via  6cc8865... s3: Tune if-conditions in a very hot codepath
       via  45dbf8c... s3: Remove a pointless memset
       via  05ce153... s3: Cache brlock.tdb entries for the fast read&write strict locking code path
       via  4df1037... ntlm_auth: use data_blob_talloc() to allocate session key
       via  9fa7523... Fix logic bug where high bits tests was being done on both Windows and POSIX mkdirs instead of only on Windows mkdir (as intended). The variable "file_attributes" had already had FILE_FLAG_POSIX_SEMANTICS removed above in the function if it had already been set. Jeremy. (cherry picked from commit 54ba3f522bd26919183278643b417e9632524be9) (cherry picked from commit cfb84c68030d4ee584db68b9c43c147c00a01ce2)
       via  48c57a4... s3:fix endianness bug in dbwrap_change_int32_atomic() (bug #6901)
       via  8df46e1... s3:fix endianness bug in dbwrap_change_uint32_atomic() (bug #6901)
       via  c636aa0... s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_db_init
       via  964ac8a... s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_alloc_init
       via  8ada8d7... s3:pdb_ldap: fix a comment typo
       via  16f6016... s3: shortcut uid_to_sid when "ldapsam:trusted = yes"
       via  ba9c056... s3: Avoid races to change the machine password in winbind
       via  6994daa... s3: Protect against flooding the DC with pwchange requests
       via  4cd1a74... s3: Re-check the timeout in machine_password_change_handler()
       via  148ab83... s3: Add some debugs to the winbind machine pwchange machinery (cherry picked from commit de8ff3e050405b2c384ef78c1dcb23db90d912a6)
       via  00e2080... s3: Factor timeval_string out of current_timestring() (cherry picked from commit 9bbec24c67949ed00b24e36b8a3a16bba8c5f5c6)
       via  7a918ba... s3: Do not kill the whole smb session if a machine pwchange failed (cherry picked from commit f488e98136b09d1bd50421ec529ca7b51d53d199)
       via  940f7b4... s3:load_interfaces(): use function gfree_interfaces() that we have.
       via  ee82ff8... s3: Replace some create_synthetic_smb_fname() calls
       via  2a2a7c7... s3: Do not talloc in readdir
       via  40b0468... WHATSNEW: Remove rpcclient subcommands.
       via  8606984... WHATSNEW: Start with the commit highlights.
       via  68b015d... WHATSNEW: Start with the major changes section.
       via  a7bd667... s3/docs: Add "max protocol = smb2" to man smb.conf.
       via  94d464a... Start removing SMB_STRUCT_STAT variables except for the directory enumeration code (which needs it). Jeremy. (cherry picked from commit 7407b526e3214287a8f42073044e2ebab058198a) (cherry picked from commit 9b68da39ea46a7f8442155eed55b2789aa25b2ed)
       via  c0a8bfa... Remove "store create time" code, cause create time to be stored in the "user.DOSATTRIB" EA. From the docs: In Samba 3.5.0 and above the "user.DOSATTRIB" extended attribute has been extended to store the create time for a file as well as the DOS attributes. This is done in a backwards compatible way so files created by Samba 3.5.0 and above can still have the DOS attribute read from this extended attribute by earlier versions of Samba, but they will not be able to read the create time stored there. Storing the create time separately from the normal filesystem meta-data allows Samba to faithfully reproduce NTFS semantics on top of a POSIX filesystem. Passes make test but will need more testing. Jeremy. (cherry picked from commit a770caed0ff66ddc2d63ac83d20f4cd7fcc2caf5) (cherry picked from commit d3b5eaa83a48388c49cc18ac094093609ed79762)
       via  a01053b... Don't overwrite a dynamic pointer with the address of a stack variable. Jeremy. (cherry picked from commit a2a8dc515cca833c442cc3bb4cf90682e8ba147d) (cherry picked from commit 66a4681a7817537611df5a800d187d4dee3a9855)
       via  bb7e33c... s3: Fix a memleak in sys_popen
       via  e4504b0... s3:fix a comment typo
       via  4bf0602... s3:is_trusted_domain: shortcut if domain name == global_sam_name
       via  a44a8d6... s3:is_trusted_domain: shortcut if domain name is NULL or empty
       via  346b506... s3:passdb: bump interface VERSION 18->19 (removed uid_to_rid)
       via  d34efc7... s3:passdb: remove the uid_to_rid method - we only need uid_to_sid
       via  b39a5cf... s3:pdb_default_uid_to_sid: fix some debug statements.
       via  61b8b58... pam_winbind: fix a printf type mismatch warning (cherry picked from commit 327e1377c96403e8a83b127470ae8464bf50347d)
       via  4079894... s3/pam: move variable declaration into belonging ifdef section
       via  e8690b0... s3: Convert libsmb/cli_message to the async API (cherry picked from commit 2b759339601ad853588cb74e986a7a88301aea17) (cherry picked from commit 1ace5f961629fc02c2ff79ed2bdd86e9e988cf28)
       via  068cbdb... util: str_list_unique() bugfix
       via  44c2030... util: str_list_unique_2() test implementation
       via  ee04805... add e2fsprogs-devel as build dependency this is needed for AD because it contains libcom/libcom_err files and headers
       via  bd99de3... packaging(RHEL-CTDB): add the current githash to the rpm release number by default
       via  23868b1... packaging(RHEL-CTDB): enable parallel build
       via  324418c... packaging(RHEL-CTDB): fix packaging of pam_winbind.mo file
       via  b01bdd4... packaging(RHEL-CTDB): move the idmap and nss_info modules to the common package
       via  52de43f... packaging(RHEL-CTDB): package the winbind_krb5_locator.so plugin
       via  c4e4982... packaging(RHEL-CTDB): package the manpage of the winbind_krb5_locator plugin
       via  62b47be... packaging(RHEL-CTDB): package the manpage of "ldbrename"
       via  3cb3c67... packaging(RHEL-CTDB): package the manpage of "sharesec"
       via  543b6f0... packaging(RHEL-CTDB): pam_winbindd man page has moved from section 7 to 8
       via  4a48ad3... packaging(RHEL-CTDB): disable the merged build.
       via  f712403... packaging(RHEL-CTDB): also pack libwbcient in winbind-32bit package
       via  f473e16... packaging(RHEL-CTDB): add new pam_winbind.mo to the common package
       via  dbc8422... packaging(RHEL-CTDB): add new binary sharesec to the client package.
       via  81d6373... packaging(RHEL-CTDB): add new binary ldbrename to the common rpm
       via  5bb27ef... packaging(RHEL-CTDB): fix location of nsswitch/ directory for install
       via  ed37ea3... packaging(RHEL-CTDB): don't pass CFLAGS to make.
       via  c9f4fa4... packaging(RHEL-CTDB): don't "make proto" any more.
       via  f302abe... packaging(RHEL-CTDB):makerpms.sh: replace source/ by source3/
       via  3381cc1... packaging(RHEL-CTDB):makespec.sh: fix detection of version
       via  4e1325e... packaging(RHEL-CTDB): makeversion.sh: v3-4-test uses source3 instead of source
       via  a34d9c6... packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit build
       via  68d68f0... packaging(RHEL-CTDB): Build winbind-32bit package in the 64bit build
       via  ae39bb7... packaging(RHEL-CTDB): extend makespec.sh to extract VENDOR_PATCH from version.h
       via  19c8f0a... packaging(RHEL-CTDB): The former release number has basically moved into VERSION
       via  bc457b1... s3:smbd: also fill the memcache with sid<->id mappings in ldapsam_sid_to_id()
       via  a822e7e... s3:smbd: make idmap cache persistent for "ldapsam:trusted".
       via  c5c8d03... Fix large paged search
       via  f1dab28... fix bogus "out of memory" winbind msg
       via  ab9739e... s3: Convert cli_unix_extensions_version to async (cherry picked from commit d718908bbd261c6bad78a202cecd90a72f17c117)
       via  339eb00... Revert "pidl: Fix selftest after s3 code changed"
       via  8505b97... s3-kerberos: remove smb_krb5_get_tkt_from_creds().
       via  cd393ff... s3-kerberos: avoid using ERROR_TABLE_BASE_krb5 without checking.
       via  1856969... lib/util Fix comments in rfc1738.c.
       via  051dc91... lib/util Use rfc1738.c from Squid for all our URL encode/decode needs.
       via  388bf0d... lib/util Add rfc1738 escape/unescape code from Squid
       via  1590e6f... pidl: Fix selftest after s3 code changed (cherry picked from commit e6df4c2bc28b9204cf0637575b0289657e604830) (cherry picked from commit 439050fb40e5ce9c476924b01f2254b9aab35a3e)
       via  affe940... Remove unused variable warning. Jeremy. (cherry picked from commit d2a9f4a2729026da11780ae4b71e289982094bd7) (cherry picked from commit 5c81851109021cc5e0733b3d153d3e2f18a16a41)
       via  792c9f7... Remove erroneous 'presult = NULL' changes. Now presult only gets set if NTSTATUS == OK. Jeremy. (cherry picked from commit 03637130316099d4f3db4ce757af2f34ce46d881) (cherry picked from commit 421ceb5070007924341b108e1a578b43b39fa058)
       via  0d8b7ad... Revert "Ensure every return path initializes presult as NULL." Vl is correct, this is the wrong way to fix this.
       via  c3ea624... Ensure all callers to the rpc_client/cli_pipe functions correctly initialize return variables. Jeremy. (cherry picked from commit 5363d6e62c2d4d3275e78d04c48835524c54f620) (cherry picked from commit 3e0add7c118cff14c3ed8f619920f4938e4795c3)
       via  c0c4c91... Fix bug 6891 - using windows explorer to change ownership on a folder fails with Bad File Descriptor. Jeremy. (cherry picked from commit 6747a91ca0c350374c54bac5892cf96e5aed029f) (cherry picked from commit 8702bdbeb552537d10b875b18ca814b9912058af)
       via  3bc5c3a... Ensure every return path initializes presult as NULL. Ensures no crashes in calling code that forgets to init return as null. Jeremy. (cherry picked from commit 83c2c177a5e86d04da37384f1f04230c8274e1e6) (cherry picked from commit 01cb74f9c9a16d49c79dd5333f0a21790d747cc0)
       via  09b864f... s3: Fix debug messages in check_reduced_name (cherry picked from commit 8006e0e63419fbb8de7e1fadf1edc6a51da9d144) (cherry picked from commit c2be4f267c6debe5cb1e97d766b681082402b847)
       via  3bf730c... cifs.upcall: Fix Bug #6868: support building with Heimdal we well as with MIT.
       via  36c16e3... s3-kerberos: add smb_krb5_principal_get_realm().
       via  f096850... Second part of bugfix for 6865 - acl_xattr module: Has dependency that inherit acls = yes or xattrs are removed. We also need dos filemode = true set as well. Jeremy. (cherry picked from commit a8769e667514f83a45ee3e825d21a351987d0210) (cherry picked from commit fbb22af1fa4fceab143de77700d388eb073e7452)
       via  ce5a595... Fix bug 6878 - Cannot change ACL's inherit flag. Based on a patch submitted by Tsukasa Hamano <hamano at osstech.co.jp>, this is a change in the POSIX ACL mapping to deal with the lossy mapping for directory ACE entries:
       via  ccbb69e... s3/docs: Document "enable spoolss".
       via  5544fd1... s3:vfs_fs_capabilities: fix a debug message
       via  b4103c5... s3/configure: Disable the automatic merged build.
       via  d693cd1... s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.
       via  4c51b47... s3-netlogon: enable RPC-NETLOGON-ADMIN test against s3.
       via  036bd1c8.. s4-smbtorture: re-arrange netlogon LogonControl test.
       via  0e57e5d... s3:registry: add an extra check for dsize==0 to regdb_fetch_keys_internal()
       via  48cf79b... s3:registry: add safety check for return value of tdb_unpack to regdb_fetch_keys_internal()
       via  64ce63f... s3:dbwrap_ctdb: add debug message to transaction_fetch_start()
       via  23562bb... s3:dbwrap_ctdb: split combined check in two and add descriptive debug
       via  dd71461... s3:dbwrap_ctdb: fix race condition with concurrent transactions on the same node.
       via  5664502... s3:configure: add a check for the new CTDB_CONTROL_TRANS2_ACTIVE
       via  c9ce0f1... s3:dbwrap_ctdb: add new db_ctdb_transaction_active() that calls CTDB_CONTROL_TRANS2_COMMIT
       via  d741eee... s3:dbwrap_ctdb: fix a race in starting concurrent transactions on a single node
       via  114d73f... s3:dbwrap_ctdb: use db_ctdb_ltdb_fetch() inside db_ctdb_transaction_fetch_start
       via  73f7076... s3:dbwrap_ctdb: use db_ctdb_ltdb_fetch() inside db_ctdb_transaction_fetch()
       via  fa7ce35... s3:dbwrap_ctdb: add a function db_ctdb_ltdb_fetch()
       via  b64281b... s3:dbrwap_ctdb: add a function db_ctdb_ltdb_store()
       via  b7c88a6... s3:dbwrap_ctdb: reformat a comment slightly to enhance clearness.
       via  c451713... README.Coding: Fix typos. (cherry picked from commit 63e324dde5554db730be6f8a0f120c62f002d625)
       via  e23f315... Fix bug 6880 - cannot list workgroup servers reported by Alban Browaeys <prahal at yahoo.com> with fix. Revert 2e989bab0764c298a2530a2d4c8690258eba210c with extra comments - this broke workgroup enumeration. Jeremy. (cherry picked from commit 5d516181617419b9b078b4f375753afc3b785ced) (cherry picked from commit 3d7e651e9fe18df79e7a47f19c66df7aaf810a20)
       via  946e1b0... s3-param: fix set_inherit_acls().
       via  706180a... s3: Try to avoid dns searches with an empty site (cherry picked from commit 567dee6a70190795014d39f9557712b58cb64fca)
       via  8359e8f... WHATSNEW: Mention the new "ctdb timeout" parameter.
       via  9195cad... Revert "s3: Do not directly reference the ndr_table_* in rpcclient"
       via  0d6aa76... Revert "s3: Do not reference ndr_table_<pipe> in the cli_ routines directly"
       via  3fbc107... Revert "s3: Consolidate getting the name out of a pipes_struct"
       via  7bf26a7... Revert "s3: Do not reference the ndr_tables in the server calls directly"
       via  654c578... Revert "s3: Do not reference ndr_table when calling rpc_srv_register"
       via  2e852cf... Revert "s3: Make run_rpc_command take strings instead of a ndr_interface_table"
       via  817ba2e... Revert "s3: Make libnetapi_open_pipe take strings instead of a ndr_interface_table"
       via  c08fd67... s3: Make libnetapi_open_pipe take strings instead of a ndr_interface_table (cherry picked from commit 753963ace9a9840ae7eb1ec8e3ab4a9b5f6f3e4b)
       via  8dfaa98... s3: Make run_rpc_command take strings instead of a ndr_interface_table (cherry picked from commit a458f26d336d3859dcc848491df5ef6c6d627c82)
       via  7f8aad4... s3: Do not reference ndr_table when calling rpc_srv_register (cherry picked from commit 7b9e45e1170a1f1c8661bf52c1e9c3aa0e1d6599)
       via  bcd076f... s3: Do not reference the ndr_tables in the server calls directly
       via  70c23c1... s3: Consolidate getting the name out of a pipes_struct (cherry picked from commit 47fec3422ed002055609f6ee0e4df1c8bd625c27)
       via  5a7f019... s3: Do not reference ndr_table_<pipe> in the cli_ routines directly (cherry picked from commit f76d06c94c47413ef60891a0f44c69303ee129cf)
       via  fc9919b... s3: Do not directly reference the ndr_table_* in rpcclient (cherry picked from commit 0af2b974c6899798c96798734a09f84a17a56566)
       via  9145770... tdb: Fix a C++ warning (cherry picked from commit 06b7a09c02aa5345d675c04449d54f6c0f8c13d0)
       via  b9f8527... s3: Do the printing for DEBUGLEVEL>=10 centrally
       via  8aca78d... s3: Register the ndr_interfaces dynamically (cherry picked from commit 657cbb225e9ad2a4903b6a9a5f8e7c4c31282848)
       via  37398a0... s3: Get rid of a NULL terminator (cherry picked from commit 5791cd5df3bb8cf0b36b3ad606dad2b6b4e2b92c)
       via  28eee8a... s3: Get rid of explicit pipe names (cherry picked from commit 4bc7b833e721bb5eba09952169e5a410231a22cb)
       via  bd3e8df... s3: get_pipe_name_from_iface -> get_pipe_name_from_syntax (cherry picked from commit 1f26287bf36b164fe1f8e46d9c6d7c91bd4ff662)
       via  66032c8... Fix bug 6865 - acl_xattr module: Has dependency that inherit acls = yes or xattrs are removed. Jeremy. (cherry picked from commit bd2ffb1c7a70ef9063b99a9318b3e185ddda84fe) (cherry picked from commit 9991c4f65bfb093a3da01f3959bc4b4448e7db7b)
       via  3bf939d... Fix bug 6841 - "map acl inherit = yes" not working. The code to read the new V2 SAMBA_PAI entries had two errors. Jeremy. (cherry picked from commit afc592402068da2a928dd9975a38a6b1ccf3919f) (cherry picked from commit bfb67ee75e74e144c3b1d3a195866a5d0b728b18)
       via  ad64e52... s3-kerberos: let smb_krb5_get_tkt_from_creds() compile with older heimdal libs.
       via  5c018ab... s3-netlogon: implement _netr_GetDcName and _netr_GetAnyDcName.
       via  498a591... Revert "s3-kerberos: add smb_krb5_parse_name_flags()."
       via  76f3ce4... s3-kerberos: support S4U2SELF impersionation through cli_krb5_get_ticket().
       via  129a74a... s3-kerberos: use smb_krb5_get_credentials in ads_krb5_mk_req.
       via  ec0d1a8... s3-kerberos: modify cli_krb5_get_ticket to take a new impersonate_princ_s arg.
       via  4014d71... s3-net: better use memory credential cache in net_ads_kerberos_pac().
       via  a42d8c4... s3-net: allow to call "net ads kerberos pac <impersonation principal> -P".
       via  9179876... s3-kerberos: add impersonate_principal for kerberos_return_pac_X calls.
       via  abe630b... s3-kerberos: add smb_krb5_get_tkt_from_creds().
       via  6603017... s3-kerberos: fix some build warnings when building against heimdal.
       via  8e0dd86... s3-kerberos: add smb_krb5_get_{creds,credentials} incl. support for S4U2SELF impersonation.
       via  4183925... s3-kerberos: remove duplicate prototype.
       via  924c5b5... s3-kerberos: add smb_krb5_parse_name_flags().
       via  71988ad... s3-kerberos: add configure checks for krb5_get_creds_X api.
       via  563250c... s3-netlogon: make sure we protect some function codes in _netr_LogonControl2Ex().
       via  44853dc... s3-netlogon: let s3 pass against RPC-NETLOGON-S3 again.
       via  161e303... s3-netlogon: implement _netr_NETLOGON_INFO_4 in netr_LogonControl2Ex() and friends as well.
       via  f855b94... s3-netlogon: implement remote trust account changing in netr_LogonControl2Ex() and friends.
       via  3edd9e4... Got the logic simplification worked out so we still pass BASE-DELAYWRITE and also RAW-CLOSE. Jeremy. (cherry picked from commit c99dd5c23e25f4c1cc34f223f563915c0aa4bb6f) (cherry picked from commit 2245694f83464bce6ed77cd8aa0407ca54f20153)
       via  53933b0... Revert commit "0551284dc08eb93ef7b2b2227a45e5ec21d482fb" - simplify the logic. This was incorrect (I'll revisit this tomorrow). Jeremy. (cherry picked from commit 977fa4e37741d613df1583b7e0e83c1f0a6ce38c) (cherry picked from commit 34ad43a811191f62ed58d057e1e15485fa11d708)
       via  4664082... Remove the smbd:writetimeupdatedelay change Metze added. Metze please explain why you added this. Change --maximum-runtime=900 for smbtorture4 with BASE-DELAYWRITE. Should allow it to successfully complete now. Jeremy. (cherry picked from commit e434934526b23b34dd85b43495961260dc639e1f) (cherry picked from commit 08e57bd405d06fb7b19a93ba3895e41a4edb770f)
       via  c2e5346... Simplify the logic - remove extraneous argument and calls to set_close_write_time(). We were treating a file time set on close as a sticky write time set, and I don't think it is. I will add a torture test later to RAW-CLOSE to confirm this. Jeremy. (cherry picked from commit 0551284dc08eb93ef7b2b2227a45e5ec21d482fb) (cherry picked from commit 329969f0b759d6face8d8435bbd4d039b9a03c2a)
       via  68f915f... Fix explicit set of write time on close. Jeremy. (cherry picked from commit 2f09516a6be67d3e51ffc611ae2daa3210f07cd8) (cherry picked from commit bf21f3492b64c627e1853886b576b271b8f24503)
       via  226feed... Get closer to an accurate model of Windows timestamp changes. "Normal" non truncate writes always cause the timestamp to be set on close. Once a close is done on a handle this can reset the sticky write time to current time also. Updated smbtorture4 confirms this. Jeremy. (cherry picked from commit 7f9fe127ba31e6dd064d090d5ffc8eeb377627ab) (cherry picked from commit a153f7ddd8b40cbf9c26ef66ad397ad41cdc9cc4)
       via  dc8dfdc... Fix up some of the timing constants for DELAYWRITE. Add some extra tests up test_delayed_write_update6 to investigate what happens to a sticky write handle after a second handle close. Jeremy. (cherry picked from commit c2df97f57ce205935c37cd5a90cfeddb129cd92b) (cherry picked from commit 139711dcbd704d43fa9861e217fed8d8f92c571d)
       via  3484eed... s3: Fix a crash in notify_remove_onelevel when "change notify = no" (cherry picked from commit bcdd64523497a251b51a1a6023c41cc29cc86567)
       via  120087b... s3: Fix the talloc hierarchy in notify_remove_onelevel
       via  68191ad... s3: Add parameter "ctdb timeout"
       via  9ddcdad... s3: Fix kerberos refresh chain.
       via  c720fbe... Fix debug comment (brain wasn't working...). Jeremy. (cherry picked from commit 170d6a3084dcf4a72d5bc7dca69b1036431e0022) (cherry picked from commit 88f80efa5b0f706ccd02dea4be4fe8b378f679f1)
       via  bc3a2f7... Filter the returned DOS attributes by 0xFF for clients using older protocols (LANMAN2 or below). Jeremy. (cherry picked from commit f44d3754eeefb1a0d0282a424ae9901d72301766) (cherry picked from commit 218aab293e5c64484eac59b12f6e7bf27dd774b1)
       via  42e03c3... Remove "Protocol" as an extern, and add accessor functions. Jeremy. (cherry picked from commit cbafe17bb37acfb76acf9d9905be1029e274089e) (cherry picked from commit c572a5baa6645549e3bce8f2e049baba97fc4106)
       via  a209f12... s3: add support for full windows timestamps resolution on files
       via  2b8e6ac... WHATSNEW: Update release notes (cherry picked from commit ba15be46cabaf0875e265dd8c445aac57c3715a2)
       via  d379cbf... Make samba3-idl to fix the build. Jeremy. (cherry picked from commit f805e9472936a24eee90eeadb26ee7f6fa8bc2a9)
       via  f89263b1.. s3-lsa: fill in some more info levels in _lsa_QueryInfoPolicy().
       via  1d6c7b2... s4-smbtorture: skip three info levels while testing s3 with RPC-LSA.
       via  43e2ec7... s4-smbtorture: skip QueryInfoPolicy2 while running RPC-LSA against s3.
       via  8936f21... s4-smbtorture: skip QueryDomainInformationPolicy test against s3 in RPC-LSA.
       via  a77a18a... s4-smbtorture: simplify some torture_comments in RPC-LSA.
       via  c37f6fa... s3-passdb: cleanup some callers of pdb_get_trusteddom_pw().
       via  546ac9a... libndr: add int3264 ndr prototype.
       via  c4eb978... tdr: teach TDR about uint1632 enums
       via  3b5eb0a... pidl: update PIDL tests for uint1632 enums (cherry picked from commit 7816f9d7abf5203537c3bb7afb9511b00d2d974f) (cherry picked from commit 99afc728ebe156d8a3c966d2afed2b63dd5082ec)
       via  3031c5f... pidl: get the alignment right for uint1632 enums (NDR64)
       via  cfc55ca... tsocket: rewrite tsocket_guide.txt to reflect the current APIs
       via  0d3f74c... tsocket_bsd: return -1 and set errno to ENAMETOOLONG if the unix path is too long
       via  c1167cf... tsocket: remove prototype of non-existing tsocket_address_inet_set_broadcast()
       via  d8c7e49... Fix debug statements to use correct function name. Jeremy. (cherry picked from commit 31ce8eeb44d5060cfe85f42dc6ef092121b84a68) (cherry picked from commit 96f4bfc6ce6bd783a9d21d064eb4ad43be3b2a57)
       via  6a0aa04... requires_resume_key is a bool not int. Jeremy. (cherry picked from commit 7ae10fb892084b821f29dd36287d6deeb360ea13) (cherry picked from commit 34040826510a37b8a23dda8429b1520f990b5344)
       via  893b535... Fix more of the RAW-SEARCH test. Older info levels are not 4 byte aligned (levels 1 - 3). Jeremy. (cherry picked from commit 6a61befe3798ecf0996887164f7437c3f25c33f9) (cherry picked from commit 10556edffac3f06b5de52cbc50aaff500a511cd4)
       via  c51e893... s3: re-run make samba3-idl.
       via  2176e0a... s3: Remove debug_ctx()
       via  2b9233a... Convert from numbers to correct SMB_FIND_XX constant names. Jeremy. (cherry picked from commit 21e527c5d3d98c6e730c23281d68b0b18737b704)
       via  b396c61... Fix bug 6867 - trans2findnext returns reply_nterror(req, ntstatus) In a directory with a lot of files. Jeremy. (cherry picked from commit a38592722b05bf81905198c8f244d7303abee030)
       via  e8d0825... ndr64: added support for trailing gap alignment
       via  dbdb289... s3: Fix a 100% CPU loop when ctdbd dies during a traverse (cherry picked from commit 892f92972112e55fdea250c198623d2fd4f70d7c)
       via  522f934... s3-gencache: restore gencache_get behavior with NULL args (with torture test).
       via  1db58de... WHATSNEW: Update release notes.
       via  caace7b... s3: Make "debug hires timestamp" default to true
       via  2db0132... s3:ldap: don't search when no values where found (cherry picked from commit 54af1851060fca79d064e40acca7dfd3e39b0a25)
       via  5c5dc29... Ñ•3:ldap: search for account policies in objectclass sambaDomain, not * (cherry picked from commit e5f41591504769b5c7beb5a35bb0f95b33d27a8b)
       via  de08e1a... s3:Makefile: add LIBREPLACE_LIBS for talloc, tdb and wbclient (cherry picked from commit 751f087f72fcfedbaeb1b9704b57fbb62d77e5e0)
       via  73483a5... Ñ•3:buildsystem: fix depenencies for libreplace
       via  db4a5da... s3/docs: Fix typo.
       via  278308d... s3/docs: Remove reference to nonexistent file.
       via  bdf460c... s4-smbtorture: skip bigendian tests against s3 in RPC-LSA-SECRETS.
       via  fd85a42... s3-rpcclient: add deletetrustdom command.
       via  e2fdd8c... s3-rpcclient: add createtrustdom command.
       via  962e5ae... s3-lsa: expand struct lsa_info to carry name and sd.
       via  f12ee5b... s3-lsa: use switch in _lsa_QuerySecurity().
       via  6326534... s4-smbtorture: fix warning in RPC-WKSSVC torture test.
       via  fb48879... s3-secrets: use autogenerated code for TRUSTED_DOM_PASS struct parsing from a tdb.
       via  27e5d49... s3: add secrets.idl.
       via  5931367... Start fixing the RAW-STREAMS test - ensure that the xattr used to store the stream info in streams_depot.so is not seen in when enumerating EAs. Jeremy. (cherry picked from commit 11708ca1ee062e2462651aef82276d4403ebcc8a)
       via  797648b... s3: Fix incorrect rc check of nscd_flush_cache.
       via  1a4bd22... s3:configure: only check for gpfs_gpl.h
       via  48cdff3... s3-passdb: move open_schannel_session_store() to passdb/secrets_schannel.c.
       via  86c14c8... s3-net: acct_flags are uint32_t in net_sam_set_userflag().
       via  71580d9... adssearch: dump some more nttime timestamps.
       via  407985d... s3-lsa: add lsa_trusted_domain_mapping.
       via  82b39ec... lsa: add LSA_TRUSTED_DOMAIN access masks.
       via  ee0626e... s3-passdb: add secrets_delete_generic().
       via  8f17d75... s3-lsa: add lsa_secret_mapping.
       via  a17c40c... lsa: add LSA_SECRET access masks.
       via  f30aa85... s3-lsa: use correct function name in_lsa_RemoveAccountRights().
       via  161d8df... s3-lsa: pure cosmetic indentation fixes.
       via  2605031... s3-lsa: use enum lsa_LookupNamesLevel in lsa_lookup_level_to_flags().
       via  cb896ec... Fix map readonly in smb.conf, it is a single word (cherry picked from commit 4b69d99f28478f40a7c8fe96be74cb73198e1fda)
       via  a59f01b... Add in Metze's new code to ndr encode the user.DOSATTRIB blobs. Next I'll change the create timestamp and dos attribute code to use this. (cherry picked from commit 0ef863ad21e017693a821912c96fc69471ffe9fe)
       via  d8c9c66... s3:Makefile: rename LDSHFLAG variables to make meaning more obvious (cherry picked from commit a4556d443395c56e2ad442b62f20f73cd13e82eb)
       via  8027076... s3:net: simplify padding to single printf call (cherry picked from commit 53c6c535cde05d4c102381d782f235f0339cf6f0)
       via  6f49375... s3:net simplify padding to single printf call (cherry picked from commit 37ddb05a94342fbb84058c03685c87903e787c48)
       via  8191b31... s3:net: fix output of net rpc trustdom list
       via  39eef24... Fix bug 6572 - libsmbclient: unable to access 'msdfs proxy' share. (cherry picked from commit a227073609eb32b091f2c9e9a12504252ae380b8)
       via  9361d48... s3/docs: Document new pdbedit -K option.
       via  136de8c... s3: pdbedit: add option --kickoff-time/-K to set the user's kickoff time
       via  4a2c033... Second part of the fix for bug 6828 - infinite timeout occurs when byte lock held outside of samba. Fixes case where a connection with a pending lock can me marked "idle", and ensures that the lock queue timeout is always recalculated. Jeremy. (cherry picked from commit b3bb18554d4e414fb960b8d043af464c8b4ac43a)
       via  ef2c355... WHATSNEW: Update changes.
       via  8cd321c... s3: Rename new parameter "ldap ref follow" to "ldap follow referral".
       via  67315af... s3:docs: Public is not a synonym for access based shareenum.
       via  345e5c7... WHATSNEW: Update release notes.
       via  92e30a1... s3:docs: fake dir create times is a global parameter.
       via  5377d92... tdb: detect tdb store of identical records and skip
       via  0b2a1fa... tdb: rename 'struct list_struct' into 'struct tdb_record'
       via  77d69cc... lib/tdb: make tdbtool use tdb_check() for "check" command
       via  ab95cf4... lib/tdb: add tdb_check()
       via  ec8dd19... lib/tdb: add -t (always use transactions) option to tdbtorture
       via  0da8eca... lib/tdb: wean off TDB_ERRCODE.
       via  b34e3f9... lib/tdb: TDB_TRACE support (for developers)
       via  5613d60... s3:Makefile: add some explicit dependencies to libc
       via  7e99eb1... Fix bug 6802 - A created folder does not properly inherit permissions from parent. (cherry picked from commit e6922418846b7ffc42d8d6db4c5a08385dd365fe)
       via  9df2ecc... s4-torture: fixed double free in libnet_group test (cherry picked from commit d8d28f74aabce7c02c25c2c1543ebea0355d68a8)
       via  14f030e... util: fixed place where we could look one byte past end of string
       via  8a549a9... s3: Fix crash in pam_winbind, another reference to freed memory.
       via  e29502c... Simplify the logic. Jeremy. (cherry picked from commit 2b02c9786fc96277bc18bb088c202d3a71df8868)
       via  957ae08... Fix bug 6829 - smbclient does not show special characters properly. All successful calls to cli_session_setup() *must* be followed by calls to cli_init_creds() to stash the credentials we successfully connected with. There were 2 codepaths where this was missing. This caused smbclient to be unable to open the \srvsvc pipe to do an RPC netserverenum, and cause it to fall back to a RAP netserverenum, which uses DOS codepage conversion rather than the full UCS2 of RPC, so the returned characters were not correct (unless the DOS codepage was set correctly). Phew. That was fun to track down :-). Jeremy. (cherry picked from commit 322f0769b7a0cad2f5ee9be1b89676c2461d681b)
       via  18b8977... s4-torture: catch bad command line options
       via  b034460... s4-torture: fixed a pipe leak
       via  6c3a03e... s4-torture: fixed a fd/mem leak in the RPC-LSA-SECRETS test
       via  c1b4ba8... s4-lsa: Fix dcesrv_lsa_EnumTrustDom() and avoid infite windows client loop.
       via  c438226... s3-lsa: Fix _lsa_EnumTrustDom() and avoid infite windows client loop.
       via  a2c1b1d... s4-smbtorture: test whether an lsa_EnumTrustDom implementation would hang up a client.
       via  1de792f... s3-lsa: make s3 pass against RPC-LSA-LOOKUPNAMES again.
       via  7de8e59... nsswitch: fix the build of the winbind krb5 locator plugin.
       via  d1ad228... s4-smbtorture: fix RPC-LSA-LSALOOKUP test against w2k3 and w2k8.
       via  2f0bfba... Turn on LOCK9 test which will test for regressions in bug 6828. Jeremy. (cherry picked from commit df0430e1c3753d4adbcbbdc717bab466c3a934ff)
       via  d1a97de... Fix bug 6828 - infinite timeout occurs when byte lock held outside of samba Jeremy. (cherry picked from commit 573c2cc5c54ea3d46ac729c3e0e5a8eb6b6799ea)
       via  8efba1f... Fix comments on new test. Jeremy (cherry picked from commit 8db60c4a9bbcc5512091396dee49a7efa13d904f)
       via  7636ccb... Add local (or NFS) lock test to smbtorture. Checks that local locks conflict with CIFS locks (see bug 6868). Jeremy. (cherry picked from commit a016f4ddc8e7e4d209f4c13cbfb444c92d3245db)
       via  93fc329... Fix "make install" by removing all references to python. Not currently needed in source3, and isn't working anyway. Jeremy. (cherry picked from commit 9c7e31b64ca0564825d24c382cd9ac5f1d90ffdc)
       via  b32fb1a... Remove pythonmods from the build in source3, it doesn't build anyway and isn't needed (as far as I can tell). Jeremy. (cherry picked from commit 20d95929295a7cb16a49b0e172856eca7b5ea3b5)
       via  04ecf8e... Fix the pam_smbpass.so build with the recent linker flag changes. Jeremy. (cherry picked from commit 7034ef40040a940bf31266263067f4c3bb85f02a)
       via  da749e1... s4-smbtorture: Make it simpler to specify number of trusted domains to create in RPC-LSA-TRUSTED-DOMAINS.
       via  d0a32b6... s3-lsa: Fix _lsa_EnumTrustDom().
       via  cf93986... s3-pdb_ldap: fix crash bug in ldapsam_set_trusteddom_pw().
       via  d83378b... s3-lsa: Fix _lsa_CreateAccount() for usage of SEC_FLAG_MAXIMUM_ALLOWED.
       via  5912dd7... s3-selftest: enable RPC-LSA-PRIVILEGES against Samba 3.
       via  48ad5a3... s4-smbtorture: Fix wrong comment in RPC-LSA-TRUSTED-DOMAIN test.
       via  d798777... s4-smbtorture: split out EnumTrustedDomainsEx test in RPC-LSA-TRUSTED-DOMAINS.
       via  e95c8d6... s3-lsa: Allow to lookup 'NT AUTHORITY\Anonymous Logon' as well.
       via  6550b7f... s3-lsa: allow to lookup BUILTIN\ in lsa_LookupNames.
       via  bca7665... s3-lsa: When looking up domains in LookupNames, do not strip the sid.
       via  9501430... s3-lsa: allow to have NULL strings in lsa LookupName queries.
       via  4fb62be... s4-smbtorture: add stricter tests for LSA-LOOKUPNAMES replies.
       via  d9ed239... s4-smbtorture: move all LookupNames tests into RPC-LSA-LOOKUPNAMES.
       via  aca7c59... wbinfo: use wbcLookupDomainControllerEx for wbinfo --dsgetdcname.
       via  dd39728... libwbclient: fix wbcLookupDomainController().
       via  59b0399... s4-smbtorture: test wbcLookupDomainController{Ex} in WINBIND-WBCLIENT.
       via  70f55bf... gitignore: remove old netlogon prototypes.
       via  daa4d61... s3:configure: add support for Solaris' ld -z ignore
       via  49b768a... s3: make unresolved symbols in libs throw errors
       via  19a2b02... s3: allow using different LDFLAGS for internal libs/plugins
       via  1b11947... s4-dsdb: fixed empty structure error on solaris8
       via  d19545a... s4-idl: don't call a variable 'stat'
       via  b0095f9... lib-util: check for too many combinations in generate_unique_strs() (cherry picked from commit e94c54ff3c83d0d19e0157216632bc99d5f8d0e3)
       via  bdbd0f2... tdb: fixed the intermittent failure of tdbtorture in the build farm
       via  d0e8226... util: fixed generate_unique_strs() to be portable
       via  1baaaf8... s4:test: Fix typo.
       via  75e7e2a... Fix typo.
       via  ac366c2... s3: Don't fail authentication when one or some group of require-membership-of is invalid.
       via  df0454f... s3:configure: fix avahi activation
       via  3532b67... Fix posix_unlink test. Was doing grep without quotes around the target string. Jeremy. (cherry picked from commit 404f744772ab68ac5a4722818d447609c33a39b7)
       via  69c55e4... Add comment explaining about symlink following & posix. Jeremy. (cherry picked from commit 62620e9654fba8cdc7b070db205b1ca8ff3aade0)
       via  54ac75b... s3-netlogon: fix updating trust accout passwords with downlevel domains.
       via  931f962... Last 2 VFS_STAT -> LSTAT fixes I can see in the modules code. Jeremy. (cherry picked from commit 90a291f9581150d8a00fbb5e784f0b034f563d04)
       via  9d44796... Fix one missing STAT -> LSTAT with POSIX pathnames in vfs_xattr_tdb.c. Caught by the torture tester. I love unit tests :-). Jeremy. (cherry picked from commit 9180559b4ab26813699d3c1410b3fc1b775b0e1d)
       via  de215dc... s3: build pam_smbpass when possible (cherry picked from commit bf684180b0bdc93438ab86b102e5883d70bcea6a)
       via  420d13c... nsswitch: increase libwbclient version after adding wbcChangeTrustCredentials().
       via  98ac025... s4-smbtorture: extend netr_LogonControl test in RPC-NETLOGON.
       via  367c333... s3-netlogon: Fix _netr_ServerPasswordSet2 cleartext blob handling.
       via  66ec7f6... s4-smbtorture: test wbcLookupUserSids in WINBIND-WBCLIENT as well.
       via  b955d6b... s4-smbtorture: test wbcGuidToString and friends as well in WINBIND-WBCLIENT.
       via  d6c154d... s3-libnetapi: add nltest tool.
       via  b02e4cd... s3-libnetapi: add I_NetLogonControl{2} example code.
       via  33efd6f... s3-libnetapi: add I_NetLogonControl{2} to public headers.
       via  291ebdf... s3-libnetapi: fill in I_NetLogonControl{2}_r.
       via  b7ab595... s3-libnetapi: add I_NetLogonControl{2} skeleton.
       via  189dd84... s3-libnetapi: add I_NetLogonControl{2} to IDL.
       via  949f6ba... s3-selftest: enable WINBIND-WBCLIENT against s3.
       via  c3fafd5... s4-smbtorture: add very basic libwbclient testsuite.
       via  332cbb1... s3-net: fix build warning (missing default in switch).
       via  3c31225... s3:packaging: Fix building RHEL packages.
       via  da314d9... s4-torture: take privileges into account in BASE-MAXIMUM_ALLOWED
       via  69d3ec0... idl: added bit definition for privilege masks
       via  d788ca6... Fix valgrind memory leak in bug #6814 - Fixes for problems reported by valgrind Jeremy. (cherry picked from commit 218d5880420ea7b16b30b782de27d7ff9d1083b4)
       via  fba1a7d... s3: fixed krb5 build problem on ubuntu karmic
       via  cecf543... s3-spnego: fix memleak in spnego_parse_auth().
       via  4c58045... s3-spnego: Fix Bug #6815. Windows 2008 R2 SPNEGO negTokenTarg parsing failure.
       via  c13db8c... s3-build: we need to have talloc 2.0.1 when building with external talloc.
       via  abdaf1b... s3-passdb: missed two prototypes while moving to enum netr_SchannelType.
       via  5f4fc0e... s3/docs: Add missing meta data to man ldbrename.
       via  ae9ec5c... Fix the build, missing ->. Jeremy. (cherry picked from commit 9535d43484d299f716e8f58a2b511b7abf4332da)
       via  fa0e325... Final part of fix for bug 6793 - winbindd crash with "INTERNAL ERROR: Signal 6" Don't use mapped_user uninitialized. Jeremy. (cherry picked from commit 4c8175c1ce2696a3834dc7a8d56e9f3a786c33a4)
       via  982256d... s3:winbind: Fix a double-free
       via  7dfba1b... s3:winbind: Fix bug 6793 -- segfault in winbindd_pam_auth (cherry picked from commit 12cabf9ae8772bfc83b571f918bd8c74d62e1564)
       via  a1a9d99... s3: Fix reference to freed memory in pam_winbind.
       via  96bb7d0... s3:torture: Add a notify-bench test
       via  1757fab... s3:libsmb: Add cli_notify (cherry picked from commit bd40e01692ec209d13352d30fa4335c744f1d3ea)
       via  a0b1f51... s3:rpc: Fix is_known_pipename for dynamically loaded pipes (cherry picked from commit 476a5df4a3434687b17e91c0d70d0fd8d0f91c4a)
       via  c2bcc31... s3: Fix some nonempty blank lines (cherry picked from commit a85ea69e9971b3c195bced474f61479c8da4616b)
       via  b3c239a... s3:net: Fix a segfault in "net rpc trustdom list" for overlong domain names
       via  859b839... Remove use of "int ret" when we already have errcode. Jeremy. (cherry picked from commit 75b88390b481545ed1210ea498fba45901ae26e3)
       via  d10dbbe... Catch one more erroneous use of errno. Jeremy. (cherry picked from commit 4cbb0fb9f628f08a4bd1fcf08f50a4a1418fe2e7)
       via  f9baba3... correctly handle aio_error() and errno (cherry picked from commit e5aecfa81d0e496ba972e5fef532e4b6464ff364)
       via  5529289... s3: Fix vfs_shadow_copy2 to allow in-path @GMT-xxx (cherry picked from commit 7ff4fc589ce25c48409cdf399e437262b9799223)
       via  b0f3a9c... s3-winbindd: add wbint_ChangeMachineAccount implementation.
       via  93c7228... docs: document wbinfo -c.
       via  139d21e... nsswitch: add wbinfo -c (change trust account passwords).
       via  8d511f1... libwbclient: add wbcChangeTrustCredentials.
       via  6f399bf... docs: document wbinfo -t --domain DOMAIN behavior.
       via  0f09780... netlogon: add NL_PASSWORD_VERSION to IDL.
       via  1595ffa... s3: use enum netr_SchannelType all over the place.
       via  7faf7d0... s3-netlogon: allow to change any type of trust account password in trust_pw_find_change_and_store_it().
       via  26d7b35... s3-netlogon: pass down account name to remote password set functions.
       via  b083453... s3-docs: remove xml artefact from net.8.xml.
       via  ef67cf6... s3/loadparm: Fix severe HPUX compiler issue.
       via  b5493f8... torture: fixed socket leak in BENCH-TCON test
       via  8c1ec19... Ñ•3: fix domain trust documentation confusion
       via  1974cfc... WHATSNEW: Update changes.
       via  49bc39c... s3/proto.h: Add lp_ldap_ref_follow prototype.
       via  d3871d2... s3/smbldap: add option to disable following LDAP refs
       via  18989d6... Fix builds with external tdb
       via  a372766... Use the method used by build_env.sh to discover the user name.
       via  5907988... s3: Fix a memleak reported by dmarkey (cherry picked from commit 1f1c293d541fc2ab6dff5932ae1c9ffc1e8b58d3)
       via  7b49955... Fix builds with external talloc
       via  1b61f10... WHATSNEW: Update WHATSNEW.
       via  8a97b47... s4/torture: Add server target of OneFS
       via  d2ff809... s4/torture: Add SMB sharemode/access mask tests
       via  1b463ef... s4/torture: change comments to torture_failures
       via  893e186... s3-winbindd: NDR_WBINT_CHECKMACHINEACCOUNT should not be cacheable.
       via  84015a4... s3-winbindd: libwbclient: implement secure channel verification for specific domains in wbcCheckTrustCredentials().
       via  701ace1... wbinfo: allow to check trusts via "wbinfo -t --domain DOMAINNAME".
       via  824142c... libwbclient: implement secure channel verification for specific domains in wbcCheckTrustCredentials().
       via  d41cebc... s3-netlogon: pure cosmetic indent fixes in _netr_LogonControl2Ex().
       via  1bcf3cc... s3: make linking of libwbclient --as-needed safe
       via  73792e1... s3:Makefile: another attempt to fix the wbclient dependency
       via  c371903... s3:Makefile: another attempt to fix the netapi dependency
       via  d5f0af2... s3:Makefile: another attempt to fix the tdb dependency
       via  bb68ba0... s3:Makefile: another attempt to fix the talloc dependency
       via  5a2e600... Revert "s3:Makefile: fix talloc dependencies with static build (2nd try)"
       via  c7defdb... Revert "s3:Makefile: fix libtdb dependencies with static build"
       via  4c97cd4... Revert "s3:Makefile: fix libwbclient dependencies with static build"
       via  3be986c... Revert "s3:Makefile: fix libnetapi dependencies with static build"
       via  1dd1c7d... Cope with old CIFSFS clients that use SMBunlink to remove symlinks instead of trans2:posix_unlink. Jeremy. (cherry picked from commit 59676ec21f022a2af2f72385d8ea368f2a60ad3b)
       via  2250735... s3: Fix shadow copy display on Windows 7
       via  1dea2f3... Exteded RAW-RENAME test to catch regressions in bug 6781. Jeremy. (cherry picked from commit d294fd3a0c152e5bde491d39219c54c113db9afe)
       via  bdda07d... Oops. Don't break the build.. Jeremy. (cherry picked from commit 879c3b8888b9a77136777b269ad730d4b3ca223b)
       via  5414667... Make the logic a lot clearer and fix the comment to match. Jeremy (cherry picked from commit 48fee26ab0a7b33fa97032b85bebbb4dc7fb8c68)
       via  2165f19... Correct fix for bug 6781 - Cannot rename subfolders in Explorer view with recent versions of Samba. Without this fix, renaming a directory ./a to ./b, whilst a directory ./aa was already open would fail. Jeremy. (cherry picked from commit fcd6a57d310a55cda7ff6248a59a99d50d925bed)
       via  02d9be8... Test creating and deleting a bad symlink using the POSIX calls. Ensure we don't regress on bug 6769. Jeremy. (cherry picked from commit 22d26287cf3f89c9294c285aff12736c47b85896)
       via  4662507... s3: Add access_mask to the flock VFS call (cherry picked from commit 763c95c145b6313a1460a7e45685a7f966e8bd4d)
       via  766877b... s3-winbindd: make sure to reset connections when machine account password change chain was broken.
       via  da2f032... s3-netlogon: setup NETLOGON credential chain in rpccli_netlogon_set_trust_password() only when needed.
       via  1673a8a... Fix bug 6776 - Running overlapping Byte Lock test will core dump Samba daemon. Re-write core of POSIX locking logic. Jeremy. (cherry picked from commit 2fa98946d9eb3d0b6973dfaeadc55c8112ec30e1)
       via  8e5680d... s3-net: print error when "net rpc changetrustpw" has failed.
       via  f9ca745... s3: Remove a scary error message -- talloc_move can not fail :-)
       via  07ea1fe... s3: Fix nonempty blank lines
       via  d548e54... lib/tdr: get rid of build warning when using TDR_ALLOC macro.
       via  004fb5b... s3: remove unused PRS_POINTER_CAST macro.
       via  16a2407... s3: remove unused SYSTEMTIME struct.
       via  8edfd1e... s3:Makefile: minor clean up (cherry picked from commit a86f80beefb11fdebc00b0442d7735d6e1081995)
       via  54372a1... s3:Makefile: fix libnetapi dependencies with static build
       via  755a3e9... s3:Makefile: eventlogadm dependency cleanup
       via  2a452b3... s3:Makefile: fix libwbclient dependencies with static build
       via  6a013e7... s3:Makefile: fix libtdb dependencies with static build
       via  29524ef... s3:Makefile: fix talloc dependencies with static build (2nd try)
       via  8c977d0... Revert "s3:Makefile: fix talloc dependencies with static build"
       via  17c8fba... s3:Makefile: libsmbsharemode dependency cleanup
       via  c603ca3... s3:Makefile: net utility dependency cleanup
       via  00dcdd9... s3:configure: use --aѕ-needed linker option when supported
       via  395f247... s3:doc: add some detail about lanman auth parameter
       via  95922c6... Remove lots of duplicate code and move it into one function vfs_stat_fsp(). Stops code looking at fsp->posix_open except for exceptional circumstances. Jeremy. (cherry picked from commit da45a3ca779d3441265837167b021ea4920edb01)
       via  be490c9... Missed one VFS_STAT -> VFS_LSTAT Jeremy. (cherry picked from commit 00738a2c92ab9e8d35976b49f1809e88f77d1e9d)
       via  811660e... Fix more use of VFS_STAT when posix pathnames selected. Jeremy. (cherry picked from commit 8b5fddf729d73fa2c0e4496fa5aa0d1093c70a05)
       via  7f6e431... s3: re-run make idl. janitor for tridge.
       via  5a12fa4... w32err: WERR_DOMAIN_CONTROLLER_NOT_FOUND error value fixed
       via  cc042de... w32err: FRS_ group of errors replaced with numeric values
       via  999789e... w32err: WERR_DC_NOT_FOUND replaced with WERR_DCNOTFOUND
       via  90d2d42... w32err: WERR_USER_EXISTS replace with WERR_USEREXISTS name
       via  08e51f2... w32err: WERR_GROUP_NOT_FOUND renamed to WERR_GROUPNOTFOUND
       via  7582f0c... w32err: Importing auto-generated Win32 errors and descriptions
       via  16a4af6... s3-printing: use regval_ctr_addvalue_multi_sz.
       via  f0a18da... s3-registry: add regval_ctr_addvalue_multi_sz.
       via  a5e6e6b... s3-rpc_parse: remove unused prs_string.
       via  9dc2b76... Fix bug #6769 - symlink unlink does nothing. Always use LSTAT for POSIX pathnames. Jeremy. (cherry picked from commit 4a7016200731ea3e133665568027a3c99e1fcf71)
       via  93b27ca... NULL is not a valid event context. Jeremy. (cherry picked from commit 2820dc529a04985b7223603e826f6b9905d2611b)
       via  2325e17... s3:Makefile: fix talloc dependencies with static build
       via  7e26d6c... s3:configure: don't throw away PRINT_LIBS
       via  215de16... s3: update comment about (deprecated) a6 records (cherry picked from commit bc78a5bae3ffa1c74847adb91230afa4ea031240)
       via  8bdd244... s3-perfcount: more cleanup.
       via  33d5fdc... s3-perfcount: only pass down prs_struct when really required.
       via  f06e021... s3: add perfcount idl and generated files.
       via  8c3ae5f... s3-registry: move rpccli_winreg_Connect to the only file it belongs.
       via  188be65... s3: remove unused rpcstr_pull and rpcstr_pull_talloc.
       via  de62c31... s3-printing: more use of pull_reg_sz().
       via  f260ce3... s3-registry: use pull_reg_sz() where appropriate.
       via  9bb2d7c... Fix for CVE-2009-2813.
       via  1d52cf3... s3/docs: Set correct version number for manpages.
       via  93b43e9... Fix for CVE-2009-2906.
       via  5ae89bd... mount.cifs: don't leak passwords with verbose option
       via  64c6493... mount.cifs: check access of credential files before opening
       via  f92dd73... allow for outstanding_aio_calls to be decremented (cherry picked from commit 5b0b93991f256d1cd5c681c60075c4b17a0bc3c9)
      from  69d345c... Merge commit 'origin/v3-5-test' into v3-5-test

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable


- Log -----------------------------------------------------------------
commit e3bcc3ee957a61b2ce1c948f3337cc0f7d795e74
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Nov 26 11:18:39 2009 +0100

    create-tarball: Make it more comfortable to use the --copy-docs option.
    
    Now you can directly specify the 'make release' output dir without any
    modifications.
    
    Karolin
    (cherry picked from commit 77e2d2f1d29b69699f4539abfce7b2f32db843e4)
    (cherry picked from commit 62df932f9dc333f69bf901fe88bfac6fc4e59bcd)

commit 8b6b509825b0f403e2721643709a98978a6396ae
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 25 14:47:36 2009 -0800

    Fix warnings with talloc_asprintf.
    Jeremy.
    (cherry picked from commit c5b234c9cde079aa45ed93c42b5ed5e66ac969a3)
    (cherry picked from commit ebd6a9fb8fd510a7998867c6ea19b0b690f1a402)

commit 4d730ad7ad5126a980314b6b9516b36e449c1c1c
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 25 13:17:56 2009 -0800

    Make us pass RAW-CHKPATH with a case sensitive share.
    I know Volker will look at this closely so here's the explaination :-).
    Originally on a case-sensitive share we simply did a stat (or lstat)
    call and returned success of fail based on the result. However this
    failed to take account of incoming paths with a wildcard (which must
    always fail, and with different error messages depending on whether
    the wildcard is the last component or in the path). Also it failed
    to take account of a stat fail with ENOENT due to a missing component
    of the path as the last component (which is ok as it could be a new
    file)  or if the ENOENT was due to the missing component within
    the path (not the last component) - which must return the correct
    error. What this means is that with "case sensitive = yes" we do
    one more talloc call (to get the parent directory) and one more
    stat call (on the parent directory) in the case where the stat
    call fails. I think this is an acceptable overhead to enable
    case sensitive shares to return the correct error messages for
    applications. Volker please examine carefully :-).
    Jeremy.
    (cherry picked from commit c96d487ae3c65c17b377bb316adac4b5775448f3)
    (cherry picked from commit 00478458b56a0eea52e08605f9f1746abe22109f)

commit 127c014a4e961e12400e5667de37a42adf5a9ecd
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 25 13:17:38 2009 -0800

    Add RAW-CHKPATH test with case-sensitive share.
    Jeremy.
    (cherry picked from commit 108da2adaf77c152fd292bbdf5645923659a7c2c)
    (cherry picked from commit d99584e5cd2edd382236f1b083e7274428dfe3ac)

commit 17379a0fb7815d7e8ad9f0150726b2837357e930
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 25 21:34:55 2009 +0100

    s3-registry: fix REG_MULTI_SZ handling in registry_push_value.
    
    Catched by smbconftort test on the buildfarm.
    
    Guenther
    (cherry picked from commit 95108f1c60aaa0407aa4eb8c9a567e90302253c6)
    (cherry picked from commit 27522fa94ce11a549dee6d498e58df14355bc950)

commit 752ee6f064fde1ec61c2c828771307a09d328462
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 25 21:33:48 2009 +0100

    s3-kerberos: add check for prerequisite krb5/krb5.h header while checking for krb5/locate_plugin.h.
    
    (Needed for new Heimdal versions).
    
    Guenther
    (cherry picked from commit c438b2b3923db66672ec82e795eef543de5fcb8a)
    (cherry picked from commit 77cafe2cd7e1a7e51f074ebeb7e676b779ff2155)

commit 792fb3b6dcd964e58ea327eba71cb50b439fcc87
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 25 15:21:54 2009 +0100

    nsswitch: fix compile of winbind_krb5_locator with recent Heimdal versions.
    
    Guenther
    (cherry picked from commit 51864219cc12ceb66c281355f3e1191d5e32842d)
    (cherry picked from commit df71a31140d2a63eeb22d2dace45f6b73abde0be)

commit d1253d9cde1930707b72a306c00a32357635e1c8
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 25 15:06:19 2009 +0100

    cifs.upcall: 2nd part of fix for Bug #6868: support building with Heimdal we well as with MIT.
    
    Guenther
    (cherry picked from commit 660ee2e74523194e5f6b2b6428d76628beb74717)
    (cherry picked from commit 9e2f7070cf0eaf74297d565892edf5089756b124)

commit d06511b545ee2160aaea8f71b0bf54d60b5ffede
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 23 15:31:58 2009 +0100

    s3-spoolss: re-arrange driver info level fillup functions.
    
    Guenther
    (cherry picked from commit e92470d4427bda74537c4ecf79a7e888a1e16963)
    (cherry picked from commit 68fcb8119bec2d4613c7d0af8cef2012671b484b)

commit 748ffacf04358e0a0b44d15dd81e0a9bbcf52abc
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 24 15:22:04 2009 +0100

    s3-spoolss: fixes for _spoolss_EnumPrinterKey client and server.
    
    Thanks Metze for review!
    
    Guenther
    (cherry picked from commit 846aa18648f3b34ab5cbc4dc4ba334bbedeab2f4)
    (cherry picked from commit 87969b9f9953adaace28240d10d20b17997304ed)

commit 8199e4acff730930b875b391375d26d682245dd8
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 24 15:26:32 2009 +0100

    s3-registry: use push_reg_multi_sz() in registry_push_value().
    
    Guenther
    (cherry picked from commit 2707dfb441801e753c74657f20b5ca22a274778f)
    (cherry picked from commit 78687dcf5d6b1d66f14c62674a313d7aef825756)

commit 160d4fad1d56a64cad4a4e1a4a87ed1c2093389a
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 24 15:26:08 2009 +0100

    s3-registry: remove reg_pull_multi_sz().
    
    Guenther
    (cherry picked from commit d4e06596d50e008425b9d346c3814a03eea8309a)
    (cherry picked from commit bec0149124b6d4a0d63c00c9094387ee5b89a031)

commit f160e48be3e289c83e17681d102b0fed88aefc89
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 25 10:20:38 2009 -0800

    Fix bug 6892 - When a chown operation is issued via Windows Explorer, all ACLS are wiped out.
    Merges existing DACLs when a ACL set operation comes in with only owner or group values set.
    Jeremy.
    (cherry picked from commit 7ed6f9f0960885366800b1ca2ce9558414b62d54)
    (cherry picked from commit db4fd2b1d351be42978c48c2f5cfc61ee50ecebc)

commit 285d6bafeec97ea40ed51685b118dbbb1ecf7674
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 25 09:58:45 2009 -0800

    Fix crash due to uninitialized pointer (not a problem in 3.4.x or below).
    Jeremy.
    (cherry picked from commit 947c47f2819ff30d3c69bfbeb4b1932467b36cce)
    (cherry picked from commit 6a13107da7b1563b3bdccd66c2d7c369db7c2bb4)

commit 61a2b59a40e819c9944a725d2a06657b67d4e238
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 24 16:40:08 2009 -0800

    Remove call into reduce_name if case sensitive. This allows us to pass
    RAW-CHKPATH when case sensitive = yes, but isn't the correct way to do
    it. I'm testing a larger patch to smbd/filename.c that should fix this
    correctly, and will add a torture test to ensure RAW-CHKPATH is run against
    a case sensitive share once this is done.
    Jeremy.
    (cherry picked from commit 1ad23832cfafd46f83ac406006ff175900b81d00)
    (cherry picked from commit bec9ed47c8f543d44cdc0f4bb8302356ca5dc969)

commit cf18a880c443695207eea2350460dcef55cb3944
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 24 14:05:56 2009 -0800

    Allow us to pass RAW-CHKPATH with FILE_FLAG_POSIX_SEMANTICS set or with
    wide links = no.
    Jeremy.
    (cherry picked from commit b2dd546f01425ff17008d3b0b0c36f754e6f3eec)
    (cherry picked from commit ecae8be35c745d769ae727505d62fa8c5e57dca4)

commit b9f8a79c52c9e9b41a9c33358e4192d69ac90f97
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 24 13:02:34 2009 -0800

    Fix make test. Only do POSIX case conversion if FILE_FLAG_POSIX_SEMANTICS set. Doh !
    Jeremy.
    (cherry picked from commit 187ef6b482273244d3b5b716881ab7b5d328cbc1)
    (cherry picked from commit b8c7631107cb87e6f9984d2e637d96ce1c0e83eb)

commit 08b36037433f7008da81d1674a18b487a3d95480
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 24 16:51:30 2009 +0100

    s3: Always try SamLogonEx
    
    Required for cluster systems working in a Samba domain. With NT4 this won't
    work, but real NT4 DCs should not be around in environments that pay big bucks
    for a cluster... And if they are, they can always install a Samba DC trusting
    that NT4 domain.
    (cherry picked from commit 4c0bfcb1c8b5d276b7dcd305a2b4d197a8c94e1f)

commit b848dcf643330e27f6c53625bbc42efb1621398e
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 24 11:36:14 2009 +0100

    docs: Fix Bug 6922: Add Registry patchfile for Win7 domain join.
    
    Patchfile from SATOH Fumiyasu <fumiyas at osstech.co.jp>.
    
    Thanks!
    
    Guenther
    (cherry picked from commit 95d0f0aab01fdd751841d57cebe6150cd6fdf80c)
    (cherry picked from commit 698e8b4e26bd569607b6d1e73b8fb3da10281475)

commit 76d81087060c1437bac9ab6c46c47c13ff4bf804
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 23 16:54:34 2009 +0100

    s3-spoolss: Fix GetPrinter level 101.
    
    Guenther
    (cherry picked from commit a6142987ac164318f5023eaa91e4e65efada4423)
    (cherry picked from commit 6405413e3aa88f6cecae5439bb59b1442fb2c5c7)

commit 1aa722b7a3bb72d471f822de9bf9a8facc070ab6
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 23 13:35:32 2009 +0100

    s4-smbtorture: fix spoolss_EnumPrinterKey client in RPC-SPOOLSS-WIN.
    
    Guenther
    (cherry picked from commit 0bf518c3c20cc6d86e574733730a266dc7ef2496)

commit 3ad562cc66ec6128dcd9f3d36f8ef740aa9a4caa
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 23 12:57:46 2009 +0100

    s3-printing: remove duplicate code while cleaning up driver structs.
    
    Guenther
    (cherry picked from commit 513d6da404fb37f87e5b658198ecfd9e35985353)
    (cherry picked from commit 6b873f4569ab54109fe2ad308483c9a81666c28c)

commit 033e59db776e974c55c4f97be58c19111385d66b
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 23 21:06:54 2009 -0800

    Restore NtCreateX case handling with FILE_FLAG_POSIX_SEMANTICS to the way
    it worked in 3.3.x and 3.2.x. UCF_POSIX_PATHNAMES may no longer be needed,
    as lp_posix_pathnames() being set isn't the same as case handling from
    NtCreateX (lp_posix_pathnames() changes the STAT calls to LSTAT, not
    the case semantics).
    Jeremy.
    (cherry picked from commit a930e3e4e140a133cb2ab59d20bda9e04b93cd7a)
    (cherry picked from commit 3de925c3b74802b1f6b9b43e3c175fa2fb332182)

commit e06cf2acfd41451feb8c8c8afe3757c8626b64ed
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 23 18:00:36 2009 -0800

    Remove unused code.
    Jeremy.
    (cherry picked from commit 4b8859840be2aacc90a2779820e08a09c793df3b)
    (cherry picked from commit d87c26171b757c3a0471edac4fb982c3f8d0dc35)

commit a5b2f9300c50db49541589a822e5eef90cae798e
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 23 15:01:34 2009 -0800

    Proper fix for #6898 - Samba duplicates file content on appending. Pointed out by Volker.Restores the pathname handling for FILE_FLAG_POSIX_SEMANTICS but still prevents the O_APPEND problems. Jeremy.
    (cherry picked from commit f8bd0559ada056722d7d5ae0286753e7c591650b)
    (cherry picked from commit 45bbbb04fb9a8ff8eaa3b64c8cae42c5b8a77027)

commit d03e8921ab4944f7ee359e9d1e080061ff59477b
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 23 10:09:47 2009 -0800

    Fix bug #6898 - Samba duplicates file content on appending
    Clients using a Windows open call should not be able to set
    FILE_FLAG_POSIX_SEMANTICS in an open.
    Jeremy.
    (cherry picked from commit 7ebe5b16416a3a09ff8840ab84079fde022a957c)
    (cherry picked from commit b0fc15e36714302cd398c4da52673fd1b4361fba)

commit 677231de98dd87d5e550b7c68c968ea92cb5f3e3
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 23 13:58:23 2009 +0100

    s3-winbind: In _wbint_CheckMachineAccount, there is only one child domain ever
    (cherry picked from commit 7009361f391176c8e9e3a6fac3fbf5d7dab7fcb9)

commit 6338bc37a6bc746ab195546f49a1d74877454071
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 23 11:54:19 2009 +0100

    s3: Move a variable declaration to its only use
    (cherry picked from commit e6e439f0a4d6d1b9ffb9c5b055f5fecec3259795)

commit 9b939e17383f9c2d487586d72fb865dd8a574ba0
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 18 15:39:52 2009 +0100

    s3-spoolss: move more defines out of nt_printing.h to spoolss.idl where they belong.
    
    Guenther
    (cherry picked from commit 800d6b7820bb949588a799f2835a3d6c07815571)
    (cherry picked from commit 4eb7c5472f84edd298cd0fc8fdffa6cfd8702304)

commit 961555f894703a38578f6af8a33c5efac197bafd
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 17 12:55:45 2009 +0100

    s3-printing: remove unused NT_PRINTER_DRIVER_INFO_LEVEL structs.
    
    Guenther
    (cherry picked from commit 6364c271c4daff94c641eb9e7030f3c9a7ff1ced)
    (cherry picked from commit 4d640c449f74ebabb8d1d4003719a5b2735006e9)

commit 17db77ba80f8e7ad20b6f7d891fa28bea1e9ad83
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 17 12:54:02 2009 +0100

    s3-printing: use spoolss types and structs while getting and deleting drivers.
    
    Guenther
    (cherry picked from commit ec56895bdec90cc671a0d562749b3caf161dbdf8)
    (cherry picked from commit 450a644e462073a371a8e465c16abf74fd0abdfe)

commit 70e4af4ca8a22f1564797e4a9874fc4940716b99
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 16 15:52:31 2009 +0100

    s3-printing: use spoolss types and structs while adding drivers.
    
    Guenther
    (cherry picked from commit 68cc1166d96ac81abce78a7eb60b7b86d0eb4eda)
    (cherry picked from commit 6de2a26cc1c18b08555ff42513c7f2a685feea55)

commit f34ef13340bd8474084980257e37376499caabf4
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 20 16:33:29 2009 +0100

    s4-smbtorture: add tests for spoolss_EnumPrinterKey to RPC-SPOOLSS-PRINTER.
    
    Guenther
    (cherry picked from commit d66b7d80d5ae1a0bf2e3d1e6718f569726da7734)
    (cherry picked from commit 9dcb99af64eca362873220d5f03d04d63cf2b0de)

commit 221556f2c66f49fb4f634a6c11029560102edc26
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 20 16:34:00 2009 +0100

    s3-spoolss: fix spoolss_EnumPrinterKey client and server code.
    
    Guenther
    (cherry picked from commit d464151f3b47c675664f464b1645ca85de663655)
    (cherry picked from commit f8d0eae87453015b9fabc511a09079ea9c14b265)

commit f6615903be589294ae2d1f934b35330e154a7716
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 20 12:57:13 2009 +0100

    spoolss: fix spoolss_EnumPrinterKey IDL.
    
    Guenther
    (cherry picked from commit 366946f29b58a6efa7acbfe2a74b2ddbad4d32a2)
    (cherry picked from commit b61da25c37a715782a2edb9afddb0e9a8fdb45ee)

commit 157436102acd829722a1831e3e30fd27e4a41fb3
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 20 12:54:19 2009 +0100

    s3-build: delete more object files for "make clean".
    
    Guenther
    (cherry picked from commit eea5a166e766669b6945bb62c9202fb385179cd1)
    (cherry picked from commit 9b1294c4111fd3d8805e9ea4147ac714de943059)

commit 49b957895125f69fb4acfea57d8c211f0e3743a1
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 19 13:44:33 2009 +0100

    s3-build: really fix build of winbind_krb5_locator.
    
    Guenther
    (cherry picked from commit fc9f199f2619635f73e8ee7f3b5359521d63f325)
    (cherry picked from commit f9b1682cf2d55d3c255e8a69a2b04d8f0d8fd9b1)

commit 37ab47d84c00dae92ee5eb1609d0c764d895b155
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 19 13:39:24 2009 +0100

    s3-build: make sure to remove libds and client object files on make clean.
    
    Guenther
    (cherry picked from commit bf45447aaa35ee3b26fe76af3c73a77d7b10c2ac)
    (cherry picked from commit 05689c61609e075b64f3a01ba1e81646fda3b9d1)

commit dd7812925a370386e2a36f7c40636da1a542bacc
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 12 16:45:33 2009 +0100

    s3-rpcclient: use the parsed binding string flags for auth choice.
    
    This allows rpcclient to be called like this:
    
    rpcclient ncacn_ip_tcp:w2k8r2[sign,seal] -U administrator%secret -c "dscracknames gd"
    
    Guenther
    (cherry picked from commit 3732798008f26052c030e8a8fc9c9404fd6f5669)
    (cherry picked from commit 6f76254c31bc61805eca2f5dd8c524ac64577b1f)

commit 3746053820e98d5b5566992cc599a14b335855fa
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 22 22:38:45 2009 +0100

    s3: Fix bug 6338 -- net rpc trustdom list always display "none"
    (cherry picked from commit 3fcf1a8f9c369f1181f749d2ec9f214df493e3ab)

commit 6cc88659d4a2eea2d77d376fbfcc6e3c32c8a2a8
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 15 22:22:38 2009 +0100

    s3: Tune if-conditions in a very hot codepath
    
    This looks innocent, but it is visible in a netbench run.  Due to boolean
    short-circuiting we don't have to execute the conditions on the right-hand side
    of the &&. So putting the less likely condition left gains a bit.
    (cherry picked from commit 8cb66e2d2310567ff97e3198c37eb4c606ddc45c)

commit 45dbf8c0c8fc37b6caaf4c21d595e8c9e0f9f50d
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 16 08:54:55 2009 +0100

    s3: Remove a pointless memset
    
    We are assigning the complete structure now (we used to assign individual
    fields), so this is obsolete.
    (cherry picked from commit ca5473494216ec3d85be0ed1878d373638c2a7ae)

commit 05ce15316eaeec0d149c63bfb01bf10e25e8c2e4
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 16 09:40:47 2009 +0100

    s3: Cache brlock.tdb entries for the fast read&write strict locking code path
    
    For a netbench run this gains around 2% user-space CPU, fetching a 100MB file
    takes around 4% less.
    (cherry picked from commit d73dbd22ac40e0308213726294de0319458b4277)

commit 4df10370adf11f03e41f01c4b3d0ed8c7ca62b30
Author: Kai Blin <kai at samba.org>
Date:   Wed Nov 18 11:26:57 2009 +0100

    ntlm_auth: use data_blob_talloc() to allocate session key
    
    Thanks to Shibu Piriyath <shibunair80 at ymail.com> for spotting the issue.
    
    (cherry picked from commit 43ed7a413dec10adc8cc4ede09132441b5ba2267)
    (cherry picked from commit 7301c6deef3241dd9d0a03cfcd1153a958908c19)

commit 9fa7523660a91caf4654aa8a60e6dae0798e5b68
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Nov 20 17:23:20 2009 -0800

    Fix logic bug where high bits tests was being
    done on both Windows and POSIX mkdirs instead of
    only on Windows mkdir (as intended). The variable
    "file_attributes" had already had FILE_FLAG_POSIX_SEMANTICS
    removed above in the function if it had already been set.
    Jeremy.
    (cherry picked from commit 54ba3f522bd26919183278643b417e9632524be9)
    (cherry picked from commit cfb84c68030d4ee584db68b9c43c147c00a01ce2)

commit 48c57a4c92af3b0f0e68e1fb8195196f72a7cd6c
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 21 00:14:29 2009 +0100

    s3:fix endianness bug in dbwrap_change_int32_atomic() (bug #6901)
    
    Michael
    (cherry picked from commit 2abdeca7af052372b242981ff1ab7863a8951cfd)

commit 8df46e1e8ed9ee4f80b617912bef2747d2f53b1e
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 21 00:08:38 2009 +0100

    s3:fix endianness bug in dbwrap_change_uint32_atomic() (bug #6901)
    
    Michael
    (cherry picked from commit caa2ee448efd1ebd6d2078972ed838613e7b5151)

commit c636aa00cb441f5526f15da58593ac3a14782f5e
Author: Michael Adam <obnox at samba.org>
Date:   Fri Nov 20 12:44:43 2009 +0100

    s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_db_init
    
    When idmap backend is specified as
    idmap backend = ldap:"ldap://server1 ldap://server2"
    then currently "ldap://server1 ldap://server2" was passed to
    ldap_initialize including the quotes, leading to an ldap error.
    
    Michael
    (cherry picked from commit 180c9389c65577e25d09c3879d9768f0a24baa08)

commit 964ac8a5da86a610f5810c5bfaa749526ce42dfa
Author: Michael Adam <obnox at samba.org>
Date:   Fri Nov 20 12:38:44 2009 +0100

    s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_alloc_init
    
    When idmap alloc backend is specified as
    idmap alloc backend = ldap:"ldap://server1 ldap://server2"
    then currently "ldap://server1 ldap://server2" was passed to
    ldap_initialize including the quotes, leading to an ldap error.
    
    Michael
    (cherry picked from commit 687c3de25791dcaad58640adb85844401d166559)

commit 8ada8d7bb7972eb15461cb4dda81ec566018af87
Author: Michael Adam <obnox at samba.org>
Date:   Mon Nov 16 11:01:53 2009 +0100

    s3:pdb_ldap: fix a comment typo
    
    Michael
    (cherry picked from commit db7f220770c31bf1dc24244dfd949d012260cce5)

commit 16f60167292a2bddf79055c0a9ddbfc70cdf3d61
Author: Michael Adam <obnox at samba.org>
Date:   Mon Nov 16 11:37:18 2009 +0100

    s3: shortcut uid_to_sid when "ldapsam:trusted = yes"
    
    The normal uid_to_sid behaviour is to call sys_getpwuid()
    to get the name for the given uid and then call the
    getsampwnam passdb method for the resulting name.
    
    In the ldapsam:trusted case we can reduce the uid_to_sid
    operation to one simple search for the uidNumber attribute
    and only get the sambaSID attribute from the correspoinding
    LDAP object. This reduces the number of ldap roundtrips
    for this operation.
    
    Michael
    (cherry picked from commit 37dcc8a400ea41fb0a0559c9922cc41ac28ad045)

commit ba9c0564b156ac4f9bbb5985fa1ff6b0f1f1a44e
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 19 17:22:27 2009 +0100

    s3: Avoid races to change the machine password in winbind
    
    The machine password handler has code to deal with every node in the cluster
    trying to change the machine password at the same time. However, it is not very
    nice to the DC if everyone tries this simultaneously. This adds a random 0-255
    second offset to our timed event. When this fires a bit later than strictly
    calculated, someone else might have stepped in and have already changed it. The
    timed event handler will handle this gracefully, it won't even try to do it
    again.
    (cherry picked from commit 25605fbd2b35b97515526d7c7708f73daa448544)

commit 6994daa2e4e79f2fd99475ca3d1cfba1a969c61b
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 19 17:20:47 2009 +0100

    s3: Protect against flooding the DC with pwchange requests
    
    When there is a temporary problem changing passwords we flooded the DC with
    pwchange requests. This gives the DC a 60-second break to recover.
    (cherry picked from commit a7f742c754e9e658908d113a77241463d8e15d17)

commit 4cd1a74c2b38af77553f59867f1ec32212d7101e
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 19 17:14:40 2009 +0100

    s3: Re-check the timeout in machine_password_change_handler()
    
    Someone else might have come in between and changed the password since we
    created that timed request
    (cherry picked from commit e6eee6c54ec39dc9ba55e397165be9e5f08b22f4)

commit 148ab83210f273d0d424fbc4b88fe3fcc3a813d4
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 19 17:11:32 2009 +0100

    s3: Add some debugs to the winbind machine pwchange machinery
    (cherry picked from commit de8ff3e050405b2c384ef78c1dcb23db90d912a6)

commit 00e2080e07a5c416ca75744ca447f684ae499748
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 19 11:50:13 2009 +0100

    s3: Factor timeval_string out of current_timestring()
    (cherry picked from commit 9bbec24c67949ed00b24e36b8a3a16bba8c5f5c6)

commit 7a918ba46e9b7b5c48e1508e805f935067efdbb5
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 19 17:56:46 2009 +0100

    s3: Do not kill the whole smb session if a machine pwchange failed
    (cherry picked from commit f488e98136b09d1bd50421ec529ca7b51d53d199)

commit 940f7b4acd26e7fc96336006858b32965f6fe503
Author: Michael Adam <obnox at samba.org>
Date:   Wed Nov 18 15:19:09 2009 +0100

    s3:load_interfaces(): use function gfree_interfaces() that we have.
    
    To reduce code duplication.
    
    Michael
    (cherry picked from commit aea3a8f50131744f8393d0179cd04a1b97982028)
    (cherry picked from commit 5caad323a212a3f046adb7e5a7d86edc819a2d3a)

commit ee82ff864928933a6b323685cfdf7664fa89f190
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 15 10:46:23 2009 +0100

    s3: Replace some create_synthetic_smb_fname() calls
    
    In very hot codepaths like the statcache copy_smb_filename and the subsequent
    recursive talloc_free is noticable in the CPU load.
    (cherry picked from commit 7d68566b2cac0d686119f64946416199cc0ea0dc)

commit 2a2a7c7bc14421457317b676f9c65938448e0f83
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 16 09:49:23 2009 +0100

    s3: Do not talloc in readdir
    
    This is a hot codepath (called from the stat cache)
    (cherry picked from commit 5a80f89b39c367582419cdd2ce0ae29c691a0709)

commit 40b0468179f79bf2934cc78cd27db16e1fbd6042
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Nov 18 14:43:12 2009 +0100

    WHATSNEW: Remove rpcclient subcommands.
    
    Karolin
    (cherry picked from commit eb8f4d1ea12f46986b0d5e8e4c594863ac8a2419)

commit 8606984ad166a6cbe64eaf52650a6623327c2634
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Nov 18 14:21:31 2009 +0100

    WHATSNEW: Start with the commit highlights.
    
    Karolin
    (cherry picked from commit 7d597bed7776970d6a14087574ab456430f4d52b)

commit 68b015d319daee8c274b4a6f5ac71c8efc5ef219
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Nov 18 13:31:16 2009 +0100

    WHATSNEW: Start with the major changes section.
    
    Karolin
    (cherry picked from commit 477b5c90ab3fb7e91dfe06b2ecb678172de375d1)

commit a7bd6673521263b72005c4d717e91bfe4b2340d1
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Nov 18 13:05:24 2009 +0100

    s3/docs: Add "max protocol = smb2" to man smb.conf.
    
    Karolin
    (cherry picked from commit da8aba53d61496d0df2bd32f92030cdee0300f2f)
    (cherry picked from commit f3f14c9564b4dd6fe63f9e636307dba86be983e7)

commit 94d464a4cdec2f532df4ff683a9b34912b10667b
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 17 16:06:08 2009 -0800

    Start removing SMB_STRUCT_STAT variables except for
    the directory enumeration code (which needs it).
    Jeremy.
    (cherry picked from commit 7407b526e3214287a8f42073044e2ebab058198a)
    (cherry picked from commit 9b68da39ea46a7f8442155eed55b2789aa25b2ed)

commit c0a8bfa804d0738ead9235b222b90d06fd0c8b23
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 17 14:55:02 2009 -0800

    Remove "store create time" code, cause create time to be stored
    in the "user.DOSATTRIB" EA. From the docs:
    In Samba 3.5.0 and above the "user.DOSATTRIB" extended attribute has been extended to store
    the create time for a file as well as the DOS attributes. This is done in a backwards compatible
    way so files created by Samba 3.5.0 and above can still have the DOS attribute read from this
    extended attribute by earlier versions of Samba, but they will not be able to read the create
    time stored there. Storing the create time separately from the normal filesystem meta-data
    allows Samba to faithfully reproduce NTFS semantics on top of a POSIX filesystem.
    Passes make test but will need more testing.
    Jeremy.
    (cherry picked from commit a770caed0ff66ddc2d63ac83d20f4cd7fcc2caf5)
    (cherry picked from commit d3b5eaa83a48388c49cc18ac094093609ed79762)

commit a01053bd1a27d22b9d39a6e0efca72fcb2f91744
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 16 14:55:21 2009 -0800

    Don't overwrite a dynamic pointer with the address of a stack
    variable.
    Jeremy.
    (cherry picked from commit a2a8dc515cca833c442cc3bb4cf90682e8ba147d)
    (cherry picked from commit 66a4681a7817537611df5a800d187d4dee3a9855)

commit bb7e33cc44d8b412256241fa1dc89641f324f9fb
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Nov 14 17:23:08 2009 +0100

    s3: Fix a memleak in sys_popen
    
    Found with "dfree command" set
    (cherry picked from commit 375a8798131c55f1b65d6feef810513ed384dbf2)

commit e4504b083688e623670026ec8b87c4298121d149
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 14 01:23:05 2009 +0100

    s3:fix a comment typo
    
    Michael
    (cherry picked from commit 160787dde879148d9c6018ba0f9ca5eee527537f)

commit 4bf0602502cde53b8a5196001e0fdc2db9736da9
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 14 01:21:42 2009 +0100

    s3:is_trusted_domain: shortcut if domain name == global_sam_name
    
    A domain can't have a trust with itself.
    This saves some roundtrips to the ldap server for ldapsam.
    
    Michael
    (cherry picked from commit dc3a90cf21813526854c12db126d08ebf32f8ae5)

commit a44a8d6315b1ff5eec5879289e311841c4413f6e
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 14 01:12:22 2009 +0100

    s3:is_trusted_domain: shortcut if domain name is NULL or empty
    
    This saves some roundtrips to LDAP in an ldapsm setup.
    
    Michael
    (cherry picked from commit 0aa5a60d3033fddd652eb4ea89abdf97db912df3)

commit 346b50625d04cf91dccace8cef2c7621a7442138
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 14 01:07:34 2009 +0100

    s3:passdb: bump interface VERSION 18->19 (removed uid_to_rid)
    
    Michael
    (cherry picked from commit 5f5fac8780bdd4a39ae316eb10ebe63513b37ace)

commit d34efc75148138862de4984618fc49b59c7b1b9e
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 14 01:06:35 2009 +0100

    s3:passdb: remove the uid_to_rid method - we only need uid_to_sid
    
    Michael
    (cherry picked from commit 979ef8fddb4af4f5033c625343bf92c7e44c3eed)

commit b39a5cfc235c53f0b46b81d035fa8b1d88098f0b
Author: Michael Adam <obnox at samba.org>
Date:   Sat Nov 14 00:34:14 2009 +0100

    s3:pdb_default_uid_to_sid: fix some debug statements.
    
    Michael
    (cherry picked from commit b1c7882f83922bbf3e6afeb14cc76561568c3388)

commit 61b8b5857869abc6b0043387e49f9547a2c0b374
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Nov 14 01:52:49 2009 +0100

    pam_winbind: fix a printf type mismatch warning
    (cherry picked from commit 327e1377c96403e8a83b127470ae8464bf50347d)

commit 407989421afa9f7de410e3ddc51de42bc6744b9d
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Nov 13 23:32:04 2009 +0100

    s3/pam: move variable declaration into belonging ifdef section
    
    This fixes a unused variable 'addr' warning on some platforms
    (cherry picked from commit 8549feed3f343c3280173335f240b4e7be12328f)

commit e8690b07f5013b3e6f510a73e7fbced739f94379
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 10 19:49:41 2009 +0100

    s3: Convert libsmb/cli_message to the async API
    (cherry picked from commit 2b759339601ad853588cb74e986a7a88301aea17)
    (cherry picked from commit 1ace5f961629fc02c2ff79ed2bdd86e9e988cf28)

commit 068cbdb5e264ab072b7914aaa3f9b925f26a5ceb
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date:   Fri Nov 13 03:57:48 2009 +0200

    util: str_list_unique() bugfix
    
    j is actually the index of the last element in the list
    size of the list though is j+1 <- to make room for the
    terminating NULL element
    (cherry picked from commit 5b75201dbb9f2e6799fd5c3eee8da6230caee96c)
    (cherry picked from commit 8a5c8d559e6b34544a3cc0811d269d46bcad5182)

commit 44c2030a3b5f09e3041b14b1646481fe9ad496a4
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date:   Fri Nov 13 03:56:07 2009 +0200

    util: str_list_unique_2() test implementation
    
    Difference with previous test for str_list_unique() is
    that this test allows number of elements and number
    of duplicates to be supplied on command line using
    --option="list_unique:count=47"
    --option="list_unique:dups=7"
    (cherry picked from commit b7839b73b10746c374ca2ed96eb152fa3a03e66a)
    (cherry picked from commit c2a511b8c95a92676fbf0895d3a6fd627662ecb8)

commit ee0480529ba7d6d7e0168d8f948d3bf8671f760e
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date:   Mon Jul 6 14:08:57 2009 +0200

    add e2fsprogs-devel as build dependency this is needed for AD because it contains libcom/libcom_err files and headers
    
    Signed-off-by: Christian Ambach <christian.ambach at de.ibm.com>
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit d0ac2c8a0ad59a118194102b2f6882e474f750a2)

commit bd99de30ca08c060e4862ab24016f83c86f8af42
Author: Michael Adam <obnox at samba.org>
Date:   Wed Nov 4 12:26:46 2009 +0100

    packaging(RHEL-CTDB): add the current githash to the rpm release number by default
    
    Disable this (to build a release-rpm) by calling
    
    USE_GITHASH=no makerpms.sh
    
    Michael
    (cherry picked from commit cfe3274345a2e29dea0d3055ed831fe4d52179e8)

commit 23868b1bf676c8770feaec3015c96272632f3de9
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 20 13:37:11 2009 +0200

    packaging(RHEL-CTDB): enable parallel build
    
    Michael
    (cherry picked from commit 3e775a2210bba4af07965c090d565e9185984d76)

commit 324418c663cae927d2cba2378600b6ad2c3eb9bb
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 20 13:33:42 2009 +0200

    packaging(RHEL-CTDB): fix packaging of pam_winbind.mo file
    
    Michael
    (cherry picked from commit 7a91ead09f002926230f6e3c248b6ef586509630)

commit b01bdd4de6c381099c6a4931ec6f726b9a3ba74c
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 15:30:42 2009 +0200

    packaging(RHEL-CTDB): move the idmap and nss_info modules to the common package
    
    In this layout, this is the package that contains winbindd related stuff.
    
    Michael
    (cherry picked from commit 2d4f971ff5b0f1b582370cb45aa70a53c94ab5da)

commit 52de43fe053778614014383d91609c2ec6b6f778
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 14:32:52 2009 +0200

    packaging(RHEL-CTDB): package the winbind_krb5_locator.so plugin
    
    Michael
    (cherry picked from commit a0c65f9abb239a5a27e3082745c15e8ae19907f5)

commit c4e49827d3e17ebb402b6b13a48ced3be3aee33e
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 14:05:42 2009 +0200

    packaging(RHEL-CTDB): package the manpage of the winbind_krb5_locator plugin
    
    Michael
    (cherry picked from commit e97d6bd520b7624e09b0fb101e6842b9a91ad804)

commit 62b47be30404d19fb5944f2d3a1fd84b93c1ea7c
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 14:04:33 2009 +0200

    packaging(RHEL-CTDB): package the manpage of "ldbrename"
    
    Michael
    (cherry picked from commit 2fa621de08364be9b3dea7cce2e4616bfe07d689)

commit 3cb3c670951285d42bef1b128e4b610364bc6179
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 14:04:09 2009 +0200

    packaging(RHEL-CTDB): package the manpage of "sharesec"
    
    Michael
    (cherry picked from commit 331b816a0bbe5c201edef20d2bb87ef97f9ee206)

commit 543b6f0ccc52dd53db86c28eb9403dec6414d0e0
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 13:45:40 2009 +0200

    packaging(RHEL-CTDB): pam_winbindd man page has moved from section 7 to 8
    
    This due to updating the docs tarball to the 3.4 docs.
    
    Michael
    (cherry picked from commit d70f61aa50482dd3fbd8f4f754be92a864233eac)

commit 4a48ad33e811140df5f3288c893126633a0d9a2a
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jul 1 11:06:34 2009 +0200

    packaging(RHEL-CTDB): disable the merged build.
    
    Michael
    (cherry picked from commit 94bcef772d2a78711a345963aa1edc7037d7057d)

commit f71240328f5506312b4e2573e9279b0895d660e7
Author: Michael Adam <obnox at samba.org>
Date:   Fri Mar 20 00:47:45 2009 +0100

    packaging(RHEL-CTDB): also pack libwbcient in winbind-32bit package
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 34be433f948e32fec3a01fe138c526671310253d)

commit f473e162bcad74107d5ba9d52476a0d40e70437d
Author: Michael Adam <obnox at samba.org>
Date:   Fri Mar 20 00:30:35 2009 +0100

    packaging(RHEL-CTDB): add new pam_winbind.mo to the common package
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 0c4c24a074b7f3aebadbef93733e19312b0c4289)

commit dbc842215126c2aee3373dbd9815be4912183f6c
Author: Michael Adam <obnox at samba.org>
Date:   Fri Mar 20 00:28:36 2009 +0100

    packaging(RHEL-CTDB): add new binary sharesec to the client package.
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit f8772b9beda656bc7520a9d357a2407b08e70061)

commit 81d6373008de49a0bcca01601fb721a65e386e4f
Author: Michael Adam <obnox at samba.org>
Date:   Fri Mar 20 00:26:11 2009 +0100

    packaging(RHEL-CTDB): add new binary ldbrename to the common rpm
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit e364d9c522a2e2585ce8f74ffb5fad68639074f1)

commit 5bb27ef167e88f02073ac7c87683ef40e8cd5d67
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 29 17:07:14 2009 +0200

    packaging(RHEL-CTDB): fix location of nsswitch/ directory for install
    
    This has been moved to the top level directory in 3.4.
    
    Michael
    (cherry picked from commit 5bfcde9f41a87d20490d2d94342892becf90383a)

commit ed37ea388f6ef6c3a84ef7873bab469099effb3b
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 29 17:05:00 2009 +0200

    packaging(RHEL-CTDB): don't pass CFLAGS to make.
    
    This breaks the build since 3.3 since it overwrites the CFLAGS
    set by configure.
    
    Michael
    (cherry picked from commit 58c72fa02ce943bb47287ca53bfb657b0b1e5b26)

commit c9f4fa4ea19c583b337abe63c53cee32563d2c56
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 29 17:03:09 2009 +0200

    packaging(RHEL-CTDB): don't "make proto" any more.
    
    This has become unnecessary in 3.3
    
    Michael
    (cherry picked from commit c4d02edcbbea076e5ba87c52a27054c497dc6c9b)

commit f302abed51e11abf0a77b578eb2dee6bd313a091
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 23 23:09:09 2009 +0200

    packaging(RHEL-CTDB):makerpms.sh: replace source/ by source3/
    
    Michael
    (cherry picked from commit c4af2b666b9310693820608b56114bad377d1236)

commit 3381cc1c9492f646f3f1e9193a65587b65ba3bae
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 23 23:06:40 2009 +0200

    packaging(RHEL-CTDB):makespec.sh: fix detection of version
    
    Michael
    (cherry picked from commit 1421aad532daf93d213e6c1b74ad00535832ece3)

commit 4e1325e2568378770235b57c9daa9c8c65d7a53b
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 23 22:41:51 2009 +0200

    packaging(RHEL-CTDB): makeversion.sh: v3-4-test uses source3 instead of source
    
    Michael
    (cherry picked from commit 3a56367867c3578781b8c4ebaf3047c6d5fa3579)

commit a34d9c6a18dba1f96e5e253357fdeece05b39efc
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 09:49:12 2009 +0100

    packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit build
    
    Michael
    (cherry picked from commit a9a506b6640986548e2ae8540b7ae93960d6ece5)
    (cherry picked from commit 63d465cdbf522409b6ba9e6507be908d15ac997a)

commit 68d68f049eaca93f38f74dbcec112ece6780a899
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jan 20 19:47:28 2009 +0100

    packaging(RHEL-CTDB): Build winbind-32bit package in the 64bit build
    
    Michael
    (cherry picked from commit f5cd88a25f360e6609dc5abe24247fab78af6854)
    (cherry picked from commit 0fa142fd45d09f7b700eb0a4bb984c16ca28a042)

commit ae39bb7a8d4491747a59e0bb2ecc549e5234531d
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 11:03:34 2009 +0100

    packaging(RHEL-CTDB): extend makespec.sh to extract VENDOR_PATCH from version.h
    
    Michael
    (cherry picked from commit fc122aa276bce379b492e5bdf52ab3e03bc3737f)
    (cherry picked from commit fe585b56af225b3bc96eac6b0cd57de4cd305f07)

commit 19c8f0aa2c32d5c0a9a81abfca3fea78d0715210
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 10:24:31 2009 +0100

    packaging(RHEL-CTDB): The former release number has basically moved into VERSION
    
    Michael
    (cherry picked from commit d39a1b4a09e86dd040158d545258507666b3cab1)

commit bc457b16ffc8d5c3a61f290adf80da1d82f9fecd
Author: Michael Adam <obnox at samba.org>
Date:   Fri Nov 13 16:16:50 2009 +0100

    s3:smbd: also fill the memcache with sid<->id mappings in ldapsam_sid_to_id()
    
    not only the persistent idmap cache.
    
    Michael
    (cherry picked from commit ee2565bd461ccfb916c5290c883e5ced3af72141)

commit a822e7e66d97555becf8280f5ee905dcaead0507
Author: Michael Adam <obnox at samba.org>
Date:   Fri Nov 13 15:51:33 2009 +0100

    s3:smbd: make idmap cache persistent for "ldapsam:trusted".
    
    This stores the mappings found in the idmap cache (which lives
    inside gencache). This cache is already read in sid_to_Xid()
    and Xid_to_sid() for ldapsam:trusted, this fills the opposite
    direction, massively reducing the number of ldap roundtrips
    across smbd restarts.
    
    Michael
    (cherry picked from commit d5537cbbf931f0bca519371bfd084fb0051acd57)

commit c5c8d03af22d9c278f2cf31be5cab8c91a09061d
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 18 16:04:04 2009 +0200

    Fix large paged search
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit afb06a8af3c4e86ef9960c8beb19a22f5fd0f3c2)

commit f1dab28f8e3c2e09776c6d7e30fffe4a06674bf4
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 13 10:12:26 2009 +0200

    fix bogus "out of memory" winbind msg
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit a15ffba403cebd8b915f6fdd3de66114c0871219)

commit ab9739e9ff512a2c38da217ea306992c44d43e20
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 12 23:07:21 2009 +0100

    s3: Convert cli_unix_extensions_version to async
    (cherry picked from commit d718908bbd261c6bad78a202cecd90a72f17c117)

commit 339eb00a7d8d21be57a56a406880a36411ec26b2
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 12 20:31:49 2009 -0800

    Revert "pidl: Fix selftest after s3 code changed"
    
    This reverts commit 439050fb40e5ce9c476924b01f2254b9aab35a3e.
    
    Not needed in this branch (yet).
    (cherry picked from commit a656083180683cf93bc4c1b9885d2749e5d238b2)

commit 8505b97d830ecb60e4a167ef8f16ca8d8d6aab9d
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 12 15:42:03 2009 +0100

    s3-kerberos: remove smb_krb5_get_tkt_from_creds().
    
    Now that cli_krb5_get_ticket() already handles S4U2SELF impersonation, remove
    smb_krb5_get_tkt_from_creds() which is not required anymore.
    
    Guenther
    (cherry picked from commit 61f0b247633501d6bf4103ca8345048e537c043d)
    (cherry picked from commit a40c5eadf6da1d7e8b193f0bfbc2a15fb592b585)

commit cd393ff04b17298d64498f2f65196c4a3ba142d3
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 12 15:40:42 2009 +0100

    s3-kerberos: avoid using ERROR_TABLE_BASE_krb5 without checking.
    
    Guenther
    (cherry picked from commit 0f8bf47d949fbdf47bdb388ad584652202ce185b)
    (cherry picked from commit 07fd6cd68951f88d4c8e12156167a18ee6972be5)

commit 18569696c6564a7c99e145e53d35dc9f3f47ebe8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Nov 2 16:39:31 2009 +1100

    lib/util Fix comments in rfc1738.c.
    
    The Samba version does not use static buffers
    
    Andrew Bartlett
    (cherry picked from commit 5a8f21cb88e7579c12b3d97299f355bb64957a87)
    (cherry picked from commit 0f4674c62cb5ed651221a06f05fe3985351e92db)

commit 051dc91d1bea58025cffe57d4a30973f028e45bf
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Oct 30 08:58:34 2009 +1100

    lib/util Use rfc1738.c from Squid for all our URL encode/decode needs.
    
    Andrew Bartlett
    (cherry picked from commit 7a290130bdeb411625f16451af3f2cfd25eeaf00)
    (cherry picked from commit fa0f418baa628e63cf2b04e769c840eefa9aa61e)

commit 388bf0dd67de0a48b0eec48156e6a2af17f35023
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Oct 29 17:09:49 2009 +1100

    lib/util Add rfc1738 escape/unescape code from Squid
    
    This is intended to replace our rfc1738_unescape(), and give us an
    rfc1738_escape implementation (and hopefully is better tested and more
    secure).
    
    Andrew Bartlett
    (cherry picked from commit 87195f55de771546ea74c0ab06d882f900588099)
    (cherry picked from commit 4e4c75422f07447622d30192c93ffbd4a7874bc2)

commit 1590e6f98d69f2ade72da87170d5f8ef14c25b25
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 9 14:26:55 2009 +0100

    pidl: Fix selftest after s3 code changed
    (cherry picked from commit e6df4c2bc28b9204cf0637575b0289657e604830)
    (cherry picked from commit 439050fb40e5ce9c476924b01f2254b9aab35a3e)

commit affe940a9f23076a7cdcef84a04c2242870a2168
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 12 14:09:25 2009 -0800

    Remove unused variable warning.
    Jeremy.
    (cherry picked from commit d2a9f4a2729026da11780ae4b71e289982094bd7)
    (cherry picked from commit 5c81851109021cc5e0733b3d153d3e2f18a16a41)

commit 792c9f789089b218a1b7257b09b2faf8bd8fef35
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 12 13:59:25 2009 -0800

    Remove erroneous 'presult = NULL' changes. Now presult only gets set
    if NTSTATUS == OK.
    Jeremy.
    (cherry picked from commit 03637130316099d4f3db4ce757af2f34ce46d881)
    (cherry picked from commit 421ceb5070007924341b108e1a578b43b39fa058)

commit 0d8b7adfefb96409801e30df74e2fdb480c0b0cc
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 12 13:57:13 2009 -0800

    Revert "Ensure every return path initializes presult as NULL."
    Vl is correct, this is the wrong way to fix this.
    
    This reverts commit 83c2c177a5e86d04da37384f1f04230c8274e1e6.
    (cherry picked from commit 496d147dc4d50650ef1e88877aa28719458089b8)
    (cherry picked from commit ca13c8cef238285c09ef5850a91ca1771a2a9685)

commit c3ea624861a5e7863ad6c2a901ea7111b5429818
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 12 13:56:33 2009 -0800

    Ensure all callers to the rpc_client/cli_pipe functions correctly
    initialize return variables.
    Jeremy.
    (cherry picked from commit 5363d6e62c2d4d3275e78d04c48835524c54f620)
    (cherry picked from commit 3e0add7c118cff14c3ed8f619920f4938e4795c3)

commit c0c4c9122d188060209cc1528a969139f02db851
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 12 13:08:04 2009 -0800

    Fix bug 6891 - using windows explorer to change ownership on a folder fails with Bad File Descriptor.
    Jeremy.
    (cherry picked from commit 6747a91ca0c350374c54bac5892cf96e5aed029f)
    (cherry picked from commit 8702bdbeb552537d10b875b18ca814b9912058af)

commit 3bc5c3a8f29abdd62abb7ef7cb3c84b159a5da2f
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 12 11:49:54 2009 -0800

    Ensure every return path initializes presult as NULL.
    Ensures no crashes in calling code that forgets to
    init return as null.
    Jeremy.
    (cherry picked from commit 83c2c177a5e86d04da37384f1f04230c8274e1e6)
    (cherry picked from commit 01cb74f9c9a16d49c79dd5333f0a21790d747cc0)

commit 09b864f686d3c265ed0445033ebd1552bd83717e
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 12 11:07:15 2009 +0100

    s3: Fix debug messages in check_reduced_name
    (cherry picked from commit 8006e0e63419fbb8de7e1fadf1edc6a51da9d144)
    (cherry picked from commit c2be4f267c6debe5cb1e97d766b681082402b847)

commit 3bf730c554b595b0d83460c9fa4ccd2b63ac1da8
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 12 00:52:38 2009 +0100

    cifs.upcall: Fix Bug #6868: support building with Heimdal we well as with MIT.
    
    Guenther
    (cherry picked from commit b29eed492f1c056adb0b53510be10e738276ca11)
    (cherry picked from commit 1230faabf8d836b900cdb9848de9fc12a79155f3)

commit 36c16e390b9421453578f0f24706883d23f458c2
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 12 00:51:46 2009 +0100

    s3-kerberos: add smb_krb5_principal_get_realm().
    
    Guenther
    (cherry picked from commit b4e40958b7f7406dc6cdd1bef4fa3f824b9cbe3a)
    (cherry picked from commit 3571e726c09b323b4ddd17af517aef3cad94607f)

commit f09685093ce0135883cbb040f4bffa598f5790f9
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 11 18:35:18 2009 -0800

    Second part of bugfix for 6865 - acl_xattr module: Has dependency that inherit acls = yes or xattrs are removed.
    We also need dos filemode = true set as well.
    Jeremy.
    (cherry picked from commit a8769e667514f83a45ee3e825d21a351987d0210)
    (cherry picked from commit fbb22af1fa4fceab143de77700d388eb073e7452)

commit ce5a59593ebab391542a3eeddb5e266584e428e2
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 11 12:17:47 2009 -0800

    Fix bug 6878 - Cannot change ACL's inherit flag.
    Based on a patch submitted by Tsukasa Hamano <hamano at osstech.co.jp>,
    this is a change in the POSIX ACL mapping to deal with the lossy
    mapping for directory ACE entries:
    
     We have a lossy mapping: directory ACE entries
     CREATOR_OWNER ------\
         (map to)         +---> SMB_ACL_USER_OBJ
     owning sid    ------/
    
     CREATOR_GROUP ------\
         (map to)         +---> SMB_ACL_GROUP_OBJ
     primary group sid --/
    
     on set. And on read of a directory ACL
    
     SMB_ACL_USER_OBJ ----> CREATOR_OWNER
     SMB_ACL_GROUP_OBJ ---> CREATOR_GROUP.
    
     Deal with this on set by duplicating
     owning sid and primary group sid ACE
     entries into the directory ACL.
    
    Jeremy.
    (cherry picked from commit 8995d3d813978a00b50f33943c60784ddfe308bf)
    (cherry picked from commit cdcd4da33e2d2f125ac3af89afc234ca941c2ba9)

commit ccbb69e31530f0b503be35d692466d657f047bb6
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Nov 11 15:42:21 2009 +0100

    s3/docs: Document "enable spoolss".
    
    Karolin
    (cherry picked from commit f3646ff392ab736ed82d2982490aa9d57e11ec6b)
    (cherry picked from commit 2bef1fd0ef59bbb3d52c1fb475842ae3ca55308a)

commit 5544fd145a0287a62cce1a487732a48d651c5e71
Author: Michael Adam <obnox at samba.org>
Date:   Wed Nov 11 00:13:14 2009 +0100

    s3:vfs_fs_capabilities: fix a debug message
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit d363850787da9217a4f26e3b8a9fb401e75b740e)

commit b4103c5fe091b0eafb960fb87987cfbb4069949a
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Apr 15 09:52:23 2009 +0200

    s3/configure: Disable the automatic merged build.
    
    Karolin
    (cherry picked from commit f78b83ce7f33251cb067d66738454df73422507b)

commit d693cd13b106f89fe58d305a3207d2f722bc6ca7
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 10 13:10:12 2009 +0100

    s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.
    
    Guenther
    (cherry picked from commit d241b9ae4c9b520406aac98e24d078f2d4fd4ae5)
    (cherry picked from commit bc0dc5a452f52df76d3f6bbd119acd8476afe9d5)

commit 4c51b475609f9f5cb7b84dceac85c0c43d987cab
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 9 17:34:47 2009 +0100

    s3-netlogon: enable RPC-NETLOGON-ADMIN test against s3.
    
    Guenther
    (cherry picked from commit d7ce873391f215f4f3785abcd13b9d120b87e744)
    (cherry picked from commit f0e718833fa73560e06c844963fe78932a22dfb2)

commit 036bd1c888ab3b391d1d8f840086b7ab543f6a4b
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 9 17:32:31 2009 +0100

    s4-smbtorture: re-arrange netlogon LogonControl test.
    
    The LogonControl tests now are split out to a new RPC-NETLOGON-ADMIN test that
    tests the behaviour of that call when called by user, dc or workstation.
    
    Guenther
    (cherry picked from commit e9c6984cb62ce8d7d899202c1275d241a605913c)
    (cherry picked from commit 8b94ea1a55fa96078ce86dedb033b083143939ff)

commit 0e57e5da7e8e963e6cd6f071d63ce3577897cc83
Author: Michael Adam <obnox at samba.org>
Date:   Tue Nov 3 00:51:27 2009 +0100

    s3:registry: add an extra check for dsize==0 to regdb_fetch_keys_internal()
    
    Don't only rely on dptr == NULL.
    I stumbled over this one when rewriting some of the dbwrap_ctdb code.
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit b58c7d96528bf3aa781f76b76465699f97e8985c)

commit 48cf79b1f791ed6918f83dca50df6807478346e0
Author: Michael Adam <obnox at samba.org>
Date:   Tue Nov 3 00:47:37 2009 +0100

    s3:registry: add safety check for return value of tdb_unpack to regdb_fetch_keys_internal()
    
    Prevents segfaults in some situations.
    
    (For a non existent or empty record, we sometimes rely on the fetch operation
     to return dsize==0 and sometimes we rely on dptr==NULL.)
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 3fb7db84d76f15cc218554559c0f498cf00d1f7c)

commit 64ce63f5dc83c8b3f8f009880748dbb5ae169e79
Author: Michael Adam <obnox at samba.org>
Date:   Sat Oct 31 13:16:34 2009 +0100

    s3:dbwrap_ctdb: add debug message to transaction_fetch_start()
    
    for the case that another local process has started a transaction
    bewteen releasing the transaction_lock record and starting the
    transaction.
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit bb939dff52c6a032719c1a2e1e4f6c056e9a0466)

commit 23562bb789a3c19fb011f408d00a515b6e1786b3
Author: Michael Adam <obnox at samba.org>
Date:   Sat Oct 31 13:13:04 2009 +0100

    s3:dbwrap_ctdb: split combined check in two and add descriptive debug
    
    in db_ctdb_transaction_fetch_start() for error conditions when re-fetching
    the transaction_lock record inside the transaction
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 8b7189f4436ff9fc2bb91498ec76030cda730312)

commit dd71461e03042787afd01a74e4b40975c44b1de3
Author: Michael Adam <obnox at samba.org>
Date:   Thu Oct 29 00:01:45 2009 +0100

    s3:dbwrap_ctdb: fix race condition with concurrent transactions on the same node.
    
    In ctdb_transaction_commit(), when the trans2_commit control fails, there
    is a race condition in the 1 second sleep between the local transaction_cancel
    and the call to ctdb_replay_transaction(): The database is not locked, and
    neither is the transaction_lock record. So another client can start and possibly
    complete a new transaction in this gap, but only on the same node: The locking
    of the transaction_lock record on a different node which involves migration of
    the record to the other node has been disabled by introduction of the
    transaction_active flag on the db which closes precisely this gap from the start
    of the commit until the call to TRANS2_FINISH or TRANS2_ERROR.
    But this mechanism does not cover the case where a process on the same node
    tries to start a transaction: There is no obstacle to locking the transaction_lock
    record because the record does not need to be migrated.
    
    This commit closes this race condition in ctdb_transaction_fetch_start()
    by using the new ctdb_ctrl_transaction_active() call to ask the local
    ctdb daemon whether it has a transaction running on the database.
    If so, the check is repeated until the running transaction is done.
    
    This does introduce an additional call to the local ctdbd when starting
    transactions, but it does close the (hopefully) last race condition.
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 056c2376ccfdff724701edee6b319a7d6d97822e)

commit 5664502fa31faa0a449889e87247d56e048a359f
Author: Michael Adam <obnox at samba.org>
Date:   Wed Oct 28 23:56:59 2009 +0100

    s3:configure: add a check for the new CTDB_CONTROL_TRANS2_ACTIVE
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 8296188b78c2246cd7fc2bd74fd271696aeceb6c)

commit c9ce0f1eb004f5edc1735d8896f6581f5f6c3ccc
Author: Michael Adam <obnox at samba.org>
Date:   Wed Oct 28 23:56:03 2009 +0100

    s3:dbwrap_ctdb: add new db_ctdb_transaction_active() that calls CTDB_CONTROL_TRANS2_COMMIT
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit ef3ab7ba1c513860f1698143ae1f42859fb37e56)

commit d741eee4c90f0b6730b427d858740ddf0fff7fa7
Author: Michael Adam <obnox at samba.org>
Date:   Wed Oct 28 01:54:04 2009 +0100

    s3:dbwrap_ctdb: fix a race in starting concurrent transactions on a single node
    
    There are two races in concurrent transactions on a single node.
    One in starting a transaction and one with replay during commit.
    
    This commit closes the first race by storing the client pid in the
    transaction-lock record and comparing the stored pid against its own
    pid after releasing the lock and refetching the record inside the
    transaction.
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 7b37b8a5dcc08817b21e12570da6632674cc7575)

commit 114d73ff98c4be6c98d18b346bce228bacf18ba1
Author: Michael Adam <obnox at samba.org>
Date:   Wed Oct 28 01:50:15 2009 +0100

    s3:dbwrap_ctdb: use db_ctdb_ltdb_fetch() inside db_ctdb_transaction_fetch_start
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit f50ef43e69b1952ab182d2bb2e820680e5bb3643)

commit 73f70767e584b3c40cc9f24f31195f11cf38054d
Author: Michael Adam <obnox at samba.org>
Date:   Wed Oct 28 01:28:38 2009 +0100

    s3:dbwrap_ctdb: use db_ctdb_ltdb_fetch() inside db_ctdb_transaction_fetch()
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 6f004b2e193208598d78599057b0d152d9aa6049)

commit fa7ce3523807e7c97c9f1d96a48fccd93a4151da
Author: Michael Adam <obnox at samba.org>
Date:   Tue Nov 3 00:55:41 2009 +0100

    s3:dbwrap_ctdb: add a function db_ctdb_ltdb_fetch()
    
    This fetches a record from the db and splits out the ctdb header.
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 72912511a14c3c727c24c0bae06f9cece859cdbb)

commit b64281b937c40af00959166649ad5ca8780b2dd3
Author: Michael Adam <obnox at samba.org>
Date:   Thu Oct 22 16:27:45 2009 +0200

    s3:dbrwap_ctdb: add a function db_ctdb_ltdb_store()
    
    and use it in db_ctdb_store() and db_ctdb_transaction_store().
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 30e493a5fb411c50750d5f4263273425b9d6f14a)

commit b7c88a6c71ddef477f6c958766d461e774c5d143
Author: Michael Adam <obnox at samba.org>
Date:   Thu Oct 22 14:37:51 2009 +0200

    s3:dbwrap_ctdb: reformat a comment slightly to enhance clearness.
    
    Michael
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 6b5f30d420fdf867443ee3aeed999feb44f6eeda)

commit c451713c40b5359496058f16259c58a0abdd33c8
Author: Matt Kraai <mkraai at beckman.com>
Date:   Mon Aug 10 13:50:31 2009 -0700

    README.Coding: Fix typos.
    (cherry picked from commit 63e324dde5554db730be6f8a0f120c62f002d625)

commit e23f315f462690d37ddd27361aef378f54b6909d
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 9 12:44:47 2009 -0800

    Fix bug 6880 - cannot list workgroup servers
    reported by Alban Browaeys <prahal at yahoo.com> with fix.
    Revert 2e989bab0764c298a2530a2d4c8690258eba210c
    with extra comments - this broke workgroup enumeration.
    Jeremy.
    (cherry picked from commit 5d516181617419b9b078b4f375753afc3b785ced)
    (cherry picked from commit 3d7e651e9fe18df79e7a47f19c66df7aaf810a20)

commit 946e1b0f83cfa5f6cc3ac229065e843dec2c5d73
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 9 16:02:24 2009 +0100

    s3-param: fix set_inherit_acls().
    
    Jeremy, please check.
    
    Guenther
    (cherry picked from commit 8eac3075b604d5d0938e2a087a154bb6546d78b1)
    (cherry picked from commit fa13f626173fa8ae1eabe3461e354b75dc7d1d0e)

commit 706180a1fd6244954388415a4bb94f167a3ab9fb
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 9 17:06:48 2009 +0100

    s3: Try to avoid dns searches with an empty site
    (cherry picked from commit 567dee6a70190795014d39f9557712b58cb64fca)

commit 8359e8fb6a834aeb71660ac3fd02a805a0623bb8
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Nov 9 09:44:35 2009 +0100

    WHATSNEW: Mention the new "ctdb timeout" parameter.
    
    Karolin
    (cherry picked from commit 9ff12b4bbf12d41460464abe662ea48a20e0f6f3)

commit 9195cadaadcb4bb2dd5fc757c75a384c65a2ab04
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 19:38:09 2009 +0100

    Revert "s3: Do not directly reference the ndr_table_* in rpcclient"
    
    This reverts commit 70c698fd547c4bc19cf77693608bbb34acac40b5.
    (cherry picked from commit d88390e9931004fd3f33800f81246d8c16f1df06)

commit 0d6aa765e0298a55a331c16df75d1cad80d96e23
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 19:38:01 2009 +0100

    Revert "s3: Do not reference ndr_table_<pipe> in the cli_ routines directly"
    
    This reverts commit daa964013bc5d036f4da571ce22c0052ef40943a.
    (cherry picked from commit 28746a943b29dfdf2837bb17bf70fb4122f00220)

commit 3fbc10766faa44b8b80058f2dae7ff6d4f9fc49a
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 19:37:53 2009 +0100

    Revert "s3: Consolidate getting the name out of a pipes_struct"
    
    This reverts commit 9621306351cdb469ef393a6d8cbeea456bc4bd9f.
    (cherry picked from commit 579ad621b9bf6563be732e56d4690c0d046efac8)

commit 7bf26a78913fb9394db24e37e3d61515a4ba79dd
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 19:37:42 2009 +0100

    Revert "s3: Do not reference the ndr_tables in the server calls directly"
    
    This reverts commit 98fb71782e05ae72cd6abeb38b6e0b96a50c1761.
    (cherry picked from commit a4d214799f7909551251423b24dd149ffb8ce3d4)

commit 654c578578bcbd9f19e1710f53a8b07f2187f5e8
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 19:37:33 2009 +0100

    Revert "s3: Do not reference ndr_table when calling rpc_srv_register"
    
    This reverts commit 494b2aff8826947e3bd556aecb175746163da485.
    (cherry picked from commit c38006bc583cf0ff8b970d103f653fcd47cc2304)

commit 2e852cff6ad28a65c9cd6661419ffbd7cc879b3f
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 19:37:26 2009 +0100

    Revert "s3: Make run_rpc_command take strings instead of a ndr_interface_table"
    
    This reverts commit 53f2a1595e76db9fe1b42db65b51895b73365993.
    (cherry picked from commit 2a04d2e34b6ab2858c5730b66977ef5a4f3c1678)

commit 817ba2ef880a4d117d447e272f43ebb491fe200b
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 19:37:13 2009 +0100

    Revert "s3: Make libnetapi_open_pipe take strings instead of a ndr_interface_table"
    
    This reverts commit 5fc9d93408effe75abcd231c45cbc14656692ebe.
    (cherry picked from commit ea105fca3ea21d4bf669d351306aa925c9cdf75d)

commit c08fd671adfc0857b3c64d24ca579bbfc2dbdb70
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 12:31:38 2009 +0100

    s3: Make libnetapi_open_pipe take strings instead of a ndr_interface_table
    (cherry picked from commit 753963ace9a9840ae7eb1ec8e3ab4a9b5f6f3e4b)

commit 8dfaa987333e58db86caf61ca6b0e9d026b5d448
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 12:24:06 2009 +0100

    s3: Make run_rpc_command take strings instead of a ndr_interface_table
    (cherry picked from commit a458f26d336d3859dcc848491df5ef6c6d627c82)

commit 7f8aad476168149d73d6ea6425e9e7e2e5f6f835
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 11:35:53 2009 +0100

    s3: Do not reference ndr_table when calling rpc_srv_register
    (cherry picked from commit 7b9e45e1170a1f1c8661bf52c1e9c3aa0e1d6599)

commit bcd076fe7ae0a4631a2512d2ae442dcd62a9bea3
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 10:51:34 2009 +0100

    s3: Do not reference the ndr_tables in the server calls directly
    
    This involves storing the interface table in the pipes_struct
    (cherry picked from commit a94a6c3c732b42cef6e461c3e9fdc7ef25a0aca3)

commit 70c23c19cc51ef744aeb5a5cb10e777ee8535a6e
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 10:43:34 2009 +0100

    s3: Consolidate getting the name out of a pipes_struct
    (cherry picked from commit 47fec3422ed002055609f6ee0e4df1c8bd625c27)

commit 5a7f01934851e325ad8cd0c1cd46d319d4b3d9a5
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 8 09:53:08 2009 +0100

    s3: Do not reference ndr_table_<pipe> in the cli_ routines directly
    (cherry picked from commit f76d06c94c47413ef60891a0f44c69303ee129cf)

commit fc9919b570d53e30935ad114e0365530f852186c
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 1 20:21:52 2009 +0100

    s3: Do not directly reference the ndr_table_* in rpcclient
    (cherry picked from commit 0af2b974c6899798c96798734a09f84a17a56566)

commit 914577057dded1f95fb5ba1b74b73d5eb3d7785a
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 6 14:04:49 2009 +0100

    tdb: Fix a C++ warning
    (cherry picked from commit 06b7a09c02aa5345d675c04449d54f6c0f8c13d0)

commit b9f8527d8e143b2d8cf3a4c525382e9f86dc8e96
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Nov 7 10:28:40 2009 +0100

    s3: Do the printing for DEBUGLEVEL>=10 centrally
    
    12 insertions(+), 10651 deletions(-)
    
    I think that says it all :-)
    (cherry picked from commit 8a438cc8b7d3ebf082427f175e58af8b74994b03)

commit 8aca78d850035bb351e82eb95aea027cd79d2037
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 1 12:05:14 2009 +0100

    s3: Register the ndr_interfaces dynamically
    (cherry picked from commit 657cbb225e9ad2a4903b6a9a5f8e7c4c31282848)

commit 37398a0ba7b73058c625640dc452ec25e42d4776
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 1 11:33:59 2009 +0100

    s3: Get rid of a NULL terminator
    (cherry picked from commit 5791cd5df3bb8cf0b36b3ad606dad2b6b4e2b92c)

commit 28eee8a42efea3f8ba1fec59f905ba3321e23be7
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 31 20:04:54 2009 +0100

    s3: Get rid of explicit pipe names
    (cherry picked from commit 4bc7b833e721bb5eba09952169e5a410231a22cb)

commit bd3e8df43b9d37226b90c6ae6b2aeff24091eb4f
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 31 19:28:16 2009 +0100

    s3: get_pipe_name_from_iface -> get_pipe_name_from_syntax
    (cherry picked from commit 1f26287bf36b164fe1f8e46d9c6d7c91bd4ff662)

commit 66032c801acd93d6bd94e6c660daa04b46f5e303
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Nov 6 21:53:07 2009 -0800

    Fix bug 6865 - acl_xattr module: Has dependency that inherit acls = yes or xattrs are removed.
    Jeremy.
    (cherry picked from commit bd2ffb1c7a70ef9063b99a9318b3e185ddda84fe)
    (cherry picked from commit 9991c4f65bfb093a3da01f3959bc4b4448e7db7b)

commit 3bf939da9ec8995512415c9850912a103000c307
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Nov 6 17:03:29 2009 -0800

    Fix bug 6841 - "map acl inherit = yes" not working.
    The code to read the new V2 SAMBA_PAI entries had
    two errors.
    Jeremy.
    (cherry picked from commit afc592402068da2a928dd9975a38a6b1ccf3919f)
    (cherry picked from commit bfb67ee75e74e144c3b1d3a195866a5d0b728b18)

commit ad64e528fb15795fc9ad5c0943092f8a629862f3
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 6 14:46:35 2009 +0100

    s3-kerberos: let smb_krb5_get_tkt_from_creds() compile with older heimdal libs.
    
    Guenther
    (cherry picked from commit 11687e84e39291e9a0309d5df6dd088f71491593)
    (cherry picked from commit ee7ce458a266e04cf83619b9437d377aa00ece87)

commit 5c018ab477b89414ddaf2e0e6b2dace07e5d6230
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 30 13:40:17 2009 +0200

    s3-netlogon: implement _netr_GetDcName and _netr_GetAnyDcName.
    
    Guenther
    (cherry picked from commit 53d49bb7284a2d7281ad0ede20c37a6bd6d1794d)
    (cherry picked from commit de7c7939b7f164ce5ac9d65babecb37bc7504635)

commit 498a591e4b0f29e150853e29a7c135d32f8f5e7c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 6 13:48:23 2009 +0100

    Revert "s3-kerberos: add smb_krb5_parse_name_flags()."
    
    This reverts commit 17ef153b68795fec681f9ce17c198236aba2b1c2.
    (cherry picked from commit 440db5a94e0ade69c9c258a54fa4d66b808d965c)
    (cherry picked from commit c39cbefd0cce0b85aa6d67e2e6abf881e42689dc)

commit 76f3ce47e92d9db6549b88e2e9c528a76bf52636
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 5 19:10:55 2009 +0100

    s3-kerberos: support S4U2SELF impersionation through cli_krb5_get_ticket().
    
    Guenther
    (cherry picked from commit 9e48dc2b78226bdacb8988509eaa93e5c9d92787)
    (cherry picked from commit 95c05668213101755e719b10828a5e57a98b57d0)

commit 129a74a7e3448aa07557b5f69b876b997206b23d
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 5 17:49:00 2009 +0100

    s3-kerberos: use smb_krb5_get_credentials in ads_krb5_mk_req.
    
    Guenther
    (cherry picked from commit bb01aae1b9eb1bede98b7d9a9c4920082db128fe)
    (cherry picked from commit 580b7b179818427d2cb1e245387cf1c7fa819314)

commit ec0d1a8c14760c88d69e3f41a513fcae4c1e8b31
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 13 17:29:22 2008 +0200

    s3-kerberos: modify cli_krb5_get_ticket to take a new impersonate_princ_s arg.
    
    Guenther
    (cherry picked from commit 60bf0eb60788a5d4dc5de24997c5efda64f2bd73)
    (cherry picked from commit ae4175e8a13e88fe7495af745d384b48f4f02784)

commit 4014d715d8f1e0673e7a159c081ec736c0175635
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 6 12:51:29 2009 +0100

    s3-net: better use memory credential cache in net_ads_kerberos_pac().
    
    Guenther
    (cherry picked from commit 6ca8a40976f86f66713ba9a7b957f97a1c271016)
    (cherry picked from commit a1d21fcfc5f7efed93b79155efe8d2a666da773e)

commit a42d8c4261cad365e1ca281c4b5147880daff402
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 13 17:28:39 2008 +0200

    s3-net: allow to call "net ads kerberos pac <impersonation principal> -P".
    
    Guenther
    (cherry picked from commit 58184b5fd4e95bc7ad2179237808126411509eea)
    (cherry picked from commit 05a8ecea99d2e056d20d31d8e15d016220a3d405)

commit 9179876168470e5065cd81c1eb8f117568cfe4e3
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 13 17:27:21 2008 +0200

    s3-kerberos: add impersonate_principal for kerberos_return_pac_X calls.
    
    Guenther
    (cherry picked from commit 5e266225108aa3335476cbe1214cc0f484c4fd02)
    (cherry picked from commit 53680341f44babf0c1e87874feaa0cb2a0d6a615)

commit abe630be4f1b214c5e2f0896acc312e592e30eee
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 13 17:25:35 2008 +0200

    s3-kerberos: add smb_krb5_get_tkt_from_creds().
    
    Guenther
    (cherry picked from commit 4ffbfc4475c92b9190811bd189802ff265aa6846)
    (cherry picked from commit be4ad69eb9cd835ef9e97654793e60403c296b3a)

commit 6603017570875d79f2fd89bbec3745c6379deab6
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 6 10:25:53 2009 +0100

    s3-kerberos: fix some build warnings when building against heimdal.
    
    Guenther
    (cherry picked from commit bb75f713d628073c503b06a3d217195aa95d72b2)
    (cherry picked from commit 99639fab2ae3da2edc4f51e8c6e8f3314bf4f31f)

commit 8e0dd860b493c13fc3bde86371bd4f718f061344
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 13 17:22:37 2008 +0200

    s3-kerberos: add smb_krb5_get_{creds,credentials} incl. support for S4U2SELF impersonation.
    
    Guenther
    (cherry picked from commit 35dcc133c9c26d10186fe59ea096a2a5c87958e6)
    (cherry picked from commit 16ba0e8649c441834da97f9584e5a64b670a083f)

commit 418392525461703205fd30f501d2e83045d846b4
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 13 17:27:43 2008 +0200

    s3-kerberos: remove duplicate prototype.
    
    Guenther
    (cherry picked from commit 0729df3661fefeffc5154c9b01ae027b3ede4b92)
    (cherry picked from commit 33cc8575474b5de48c2cb65b1b0da07ba861277d)

commit 924c5b5f3ec513e19931e1de8f4584dbd674f7ca
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 5 19:02:55 2009 +0100

    s3-kerberos: add smb_krb5_parse_name_flags().
    
    Guenther
    (cherry picked from commit 17ef153b68795fec681f9ce17c198236aba2b1c2)
    (cherry picked from commit 158d9e3c654e52e641d0485ccfaff2b7c0659576)

commit 71988ad74d70537a2bb3e81cc1973e484664f4ec
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 13 17:21:22 2008 +0200

    s3-kerberos: add configure checks for krb5_get_creds_X api.
    
    Guenther
    (cherry picked from commit 2cd507fe144c58a4c856c73ec56b80365dad9f23)
    (cherry picked from commit 4fb1aa8f679891e95db5fa5cd7b8a74697dc0003)

commit 563250c50f9180616719bac66593f198480713cf
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 4 00:34:29 2009 +0100

    s3-netlogon: make sure we protect some function codes in _netr_LogonControl2Ex().
    
    Guenther
    (cherry picked from commit ccdd1462cc8d7e5e067b5f3d6122ee8765921b4f)
    (cherry picked from commit fc69d5a2bba292da070945d8c9d228ac38d486d8)

commit 44853dcfb37f16bc0b1b1b4ba4b5e0a452447e48
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 19 11:28:00 2009 +0200

    s3-netlogon: let s3 pass against RPC-NETLOGON-S3 again.
    
    Guenther
    (cherry picked from commit bb2e1ff6315f070b67d45600dd763011f8aba136)
    (cherry picked from commit 8d9744cf9c234c7db74e9026b217a4b3139e7da4)

commit 161e303fd81fe13cf47f16c8ee9f7d74b6e5e033
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 8 00:58:02 2009 +0200

    s3-netlogon: implement _netr_NETLOGON_INFO_4 in netr_LogonControl2Ex() and friends as well.
    
    Guenther
    (cherry picked from commit 40f3f456bcea3d37537e807dbcd3a09b08dbc870)
    (cherry picked from commit 8122dad79fef3ec3795ed11739ce87eced99d82f)

commit f855b94029b36a5385f210c911d05c7b33ed988e
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 8 00:38:53 2009 +0200

    s3-netlogon: implement remote trust account changing in netr_LogonControl2Ex() and friends.
    
    Guenther
    (cherry picked from commit b3a21474971d3ffd6135011daa5f2fe521f535d1)
    (cherry picked from commit dc95859e468c22d9ee370d53cdd66b7038665a9a)

commit 3edd9e40bcb1d256cb7490c5f1debe439ab342ba
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 5 22:58:12 2009 -0800

    Got the logic simplification worked out so we still pass
    BASE-DELAYWRITE and also RAW-CLOSE.
    Jeremy.
    (cherry picked from commit c99dd5c23e25f4c1cc34f223f563915c0aa4bb6f)
    (cherry picked from commit 2245694f83464bce6ed77cd8aa0407ca54f20153)

commit 53933b0dc1f278da1db5f959d72f5d8eb8702392
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 5 21:27:25 2009 -0800

    Revert commit "0551284dc08eb93ef7b2b2227a45e5ec21d482fb" - simplify
    the logic. This was incorrect (I'll revisit this tomorrow).
    Jeremy.
    (cherry picked from commit 977fa4e37741d613df1583b7e0e83c1f0a6ce38c)
    (cherry picked from commit 34ad43a811191f62ed58d057e1e15485fa11d708)

commit 4664082cea7de33b2610e60640471d969e619e65
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 5 17:43:33 2009 -0800

    Remove the smbd:writetimeupdatedelay change Metze added. Metze please
    explain why you added this. Change --maximum-runtime=900 for smbtorture4
    with BASE-DELAYWRITE. Should allow it to successfully complete now.
    Jeremy.
    (cherry picked from commit e434934526b23b34dd85b43495961260dc639e1f)
    (cherry picked from commit 08e57bd405d06fb7b19a93ba3895e41a4edb770f)

commit c2e5346b5a765b2cfebc3d424ea65fdc00ee58c3
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 5 17:40:01 2009 -0800

    Simplify the logic - remove extraneous argument and calls to set_close_write_time().
    We were treating a file time set on close as a sticky write time set, and I don't
    think it is. I will add a torture test later to RAW-CLOSE to confirm this.
    Jeremy.
    (cherry picked from commit 0551284dc08eb93ef7b2b2227a45e5ec21d482fb)
    (cherry picked from commit 329969f0b759d6face8d8435bbd4d039b9a03c2a)

commit 68f915f2b376213a2f4f2ca441f107916cf5f1cb
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 5 17:12:11 2009 -0800

    Fix explicit set of write time on close.
    Jeremy.
    (cherry picked from commit 2f09516a6be67d3e51ffc611ae2daa3210f07cd8)
    (cherry picked from commit bf21f3492b64c627e1853886b576b271b8f24503)

commit 226feed0df77efdda5f857b2fdc7023fb4069156
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 5 16:20:11 2009 -0800

    Get closer to an accurate model of Windows timestamp changes.
    "Normal" non truncate writes always cause the timestamp to
    be set on close. Once a close is done on a handle this can
    reset the sticky write time to current time also.
    Updated smbtorture4 confirms this.
    Jeremy.
    (cherry picked from commit 7f9fe127ba31e6dd064d090d5ffc8eeb377627ab)
    (cherry picked from commit a153f7ddd8b40cbf9c26ef66ad397ad41cdc9cc4)

commit dc8dfdc86e3899fd6c10fdea04b0d227e498706b
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 5 15:37:26 2009 -0800

    Fix up some of the timing constants for DELAYWRITE. Add some extra tests up test_delayed_write_update6
    to investigate what happens to a sticky write handle after a second handle close.
    Jeremy.
    (cherry picked from commit c2df97f57ce205935c37cd5a90cfeddb129cd92b)
    (cherry picked from commit 139711dcbd704d43fa9861e217fed8d8f92c571d)

commit 3484eed48d168e3e8da62d89fe4d6bcebb6bddf4
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 5 15:06:21 2009 +0100

    s3: Fix a crash in notify_remove_onelevel when "change notify = no"
    (cherry picked from commit bcdd64523497a251b51a1a6023c41cc29cc86567)

commit 120087b9fbc6fe646a6793c6293b2a01bc25876d
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 5 14:29:05 2009 +0100

    s3: Fix the talloc hierarchy in notify_remove_onelevel
    
    We want to free the record early, not when talloc_tos() is free'ed.
    (cherry picked from commit cb5145e18aac219e27010637632f060c59852b7f)

commit 68191ad0abbf55abd9b800878a0bc9584a01d72e
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 3 05:41:02 2009 +0100

    s3: Add parameter "ctdb timeout"
    
    When something in the cluster blocks, it can happen that we wait indefinitely
    long for ctdb, just adding to the blocking condition. In theory, nothing should
    block, but as someone said "In practice the difference between theory and
    practice is larger than in theory". This adds a timeout parameter in seconds,
    after which we stop waiting for ctdb and panic.
    (cherry picked from commit 872f59be48e61b0dc874aef72f96a46e8936d86d)

commit 9ddcdadc22784f78d9403b525c990dbb976bc6d6
Author: Bo Yang <boyang at samba.org>
Date:   Fri Nov 6 08:20:25 2009 +0800

    s3: Fix kerberos refresh chain.
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    (cherry picked from commit dde1c420037bfea48741ba1f600c047cca788a21)
    (cherry picked from commit 1214fe0bdd0d03f04881f2690b2cf2ff2407cf6a)

commit c720fbeb3eb108bf5d958f4135d235063fcae605
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 4 16:04:41 2009 -0800

    Fix debug comment (brain wasn't working...).
    Jeremy.
    (cherry picked from commit 170d6a3084dcf4a72d5bc7dca69b1036431e0022)
    (cherry picked from commit 88f80efa5b0f706ccd02dea4be4fe8b378f679f1)

commit bc3a2f7fefacf9f44509c5ab8f4a73e41902a2a5
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 4 15:25:15 2009 -0800

    Filter the returned DOS attributes by 0xFF for clients
    using older protocols (LANMAN2 or below).
    Jeremy.
    (cherry picked from commit f44d3754eeefb1a0d0282a424ae9901d72301766)
    (cherry picked from commit 218aab293e5c64484eac59b12f6e7bf27dd774b1)

commit 42e03c3e2f432457fbd861b96e46f0dbb169da8b
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Nov 4 15:15:50 2009 -0800

    Remove "Protocol" as an extern, and add accessor functions.
    Jeremy.
    (cherry picked from commit cbafe17bb37acfb76acf9d9905be1029e274089e)
    (cherry picked from commit c572a5baa6645549e3bce8f2e049baba97fc4106)

commit a209f125e49a9eb1dc02c61b7b1e4546a1714518
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Nov 4 11:15:31 2009 +0100

    s3: add support for full windows timestamps resolution on files
    
    setting nanosecond timestamps using utimensat() was first supported by Linux
    kernel 2.6.22 and glibc 2.6. It's specified in POSIX.1-2008.
    
    This effectively makes us use Windows' full 100ns timestamp resolution -
    actually just an improvement from 10^-6 to 10^-7.
    
    For now Linux CIFS vfs will also just be able to make use of 100ns resolution,
    not 1ns.
    (cherry picked from commit fedf1a052e3e59197c7e18ae0094b5920c6bfc9c)

commit 2b8e6acfbc5bae8e1137e87f8a573011681c5739
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Nov 3 20:07:29 2009 +0100

    WHATSNEW: Update release notes
    (cherry picked from commit ba15be46cabaf0875e265dd8c445aac57c3715a2)

commit d379cbf957eeddbe5871be4279035964d660ce56
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 3 14:20:21 2009 -0800

    Make samba3-idl to fix the build.
    Jeremy.
    (cherry picked from commit f805e9472936a24eee90eeadb26ee7f6fa8bc2a9)

commit f89263b1de8fcb9a9240060a9797e56697d970ba
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 3 11:45:15 2009 +0100

    s3-lsa: fill in some more info levels in _lsa_QueryInfoPolicy().
    
    Add dummys (just like s4 does) and fill in some more appropriate error codes.
    
    Guenther
    (cherry picked from commit 97496bb3cafd8914a3a7c7b7d3a668ba3e533769)
    (cherry picked from commit 8e0c9e40278265a1da959542178276bc042df006)

commit 1d6c7b2992bf45aa9c7fb65f09e89f27d0ca2dbe
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 3 11:46:07 2009 +0100

    s4-smbtorture: skip three info levels while testing s3 with RPC-LSA.
    
    These are only supported by s3 when running pdb_ads atm.
    
    Guenther
    (cherry picked from commit a8de4f091ef10223e862b3cb6f0b9e5cef5cde2a)
    (cherry picked from commit 3b53045146803bbb046f52ba28a39d6ca4bf4870)

commit 43e2ec784d1c0a386c504e438457215062597598
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 2 20:11:14 2009 +0100

    s4-smbtorture: skip QueryInfoPolicy2 while running RPC-LSA against s3.
    
    This is only supported by s3 when running pdb_ads atm.
    
    Guenther
    (cherry picked from commit 58d401bb212b43d05213514f8bb2efa850d4e5c9)
    (cherry picked from commit 505934c56e0df600aff8d406b7c636f830360257)

commit 8936f21564c25f7ebe168ed45b78cd85e8f1c2e9
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 2 16:51:00 2009 +0100

    s4-smbtorture: skip QueryDomainInformationPolicy test against s3 in RPC-LSA.
    
    Guenther
    (cherry picked from commit bff9819521255b3dcd0f04aa585c1ad0385896fd)
    (cherry picked from commit fc8c1b23109b90daf2b185522728d08c921a91af)

commit a77a18a8f3927f2aa2941af8d9e7585d44241306
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 2 19:59:47 2009 +0100

    s4-smbtorture: simplify some torture_comments in RPC-LSA.
    
    Guenther
    (cherry picked from commit 074ad24653e85c60b9af863ac526832229754a96)
    (cherry picked from commit 18a00b7c0c0fa6d3e2d8bcba2d3f0969697781f3)

commit c37f6fab6c9ef3c55fdbd97a974c582c60c92cb8
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 30 02:15:45 2009 +0100

    s3-passdb: cleanup some callers of pdb_get_trusteddom_pw().
    
    Guenther
    (cherry picked from commit 463b1eb2b55ae85cfc9539c936375a989cde1076)
    (cherry picked from commit b8465e0dae7033e04e14d0808c5afc0d06b3a445)

commit 546ac9a5bea23db6589c35ac5fa1706ed153821e
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 5 15:10:35 2009 +0200

    libndr: add int3264 ndr prototype.
    
    Guenther
    (cherry picked from commit 76feeb1b97b1d8f24650c5198e9c61c4f5b1357a)
    (cherry picked from commit e182940be3df57d412857cf6dad41170acbbbe88)

commit c4eb97860adcf46c37ebdc75e3105560d7a2ed36
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Oct 7 06:39:03 2009 +1100

    tdr: teach TDR about uint1632 enums
    
    TDB doesn't have NDR64, but it needs to know how to map the new types
    from pidl
    (cherry picked from commit 1d0fb1e0fba3cf4d04d4602ed4e717912804e5de)
    (cherry picked from commit eea15d8f117e07d3e121e087d23e50d94a7c6355)

commit 3b5eb0a60342ec75bb270441b92d555be994d909
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 6 20:49:14 2009 +1100

    pidl: update PIDL tests for uint1632 enums
    (cherry picked from commit 7816f9d7abf5203537c3bb7afb9511b00d2d974f)
    (cherry picked from commit 99afc728ebe156d8a3c966d2afed2b63dd5082ec)

commit 3031c5ff8348d6973077fc09f36d785eb72c4abf
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 6 20:47:09 2009 +1100

    pidl: get the alignment right for uint1632 enums (NDR64)
    
    The default enum in NDR63 is 32 bits, not 16 bits. We need a uint1632
    type to get the alignment right.
    (cherry picked from commit 2bf8a7485cf0733c808bc97a399a1c73bb988414)
    (cherry picked from commit 0724f58489edb9fa25bcc593cbd5483450b5937f)

commit cfc55cace077ec3f97fcb6093c94a75dd84d07f2
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 3 18:06:17 2009 +0100

    tsocket: rewrite tsocket_guide.txt to reflect the current APIs
    
    metze
    (cherry picked from commit 97a32035bec03b76b67cb7088a7be1b7b3b9ac48)
    (cherry picked from commit bdd16229819f524078eb6cc3a8acf9c775985a20)

commit 0d3f74c6c564b5af4bf9727e1b2e95bfe32e3327
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 3 17:23:07 2009 +0100

    tsocket_bsd: return -1 and set errno to ENAMETOOLONG if the unix path is too long
    
    metze
    (cherry picked from commit eb39f6694055267302580bbf6afa988c82c55fed)
    (cherry picked from commit 31f1d6f658827519c5dc51a4e32f95931d01d0b7)

commit c1167cfd68cdd328ca02b41b756d12fd7eb7336c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 3 17:22:27 2009 +0100

    tsocket: remove prototype of non-existing tsocket_address_inet_set_broadcast()
    
    metze
    (cherry picked from commit 9b5d1e9e355d3d04f03744e025c6685ca8ad12cd)
    (cherry picked from commit 36801f06f389c2e5ecd7d53db1e38e601fa48160)

commit d8c7e49926df8cf4ed5c14bd1ec2d43ee897a6c0
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 3 11:22:19 2009 -0800

    Fix debug statements to use correct function name.
    Jeremy.
    (cherry picked from commit 31ce8eeb44d5060cfe85f42dc6ef092121b84a68)
    (cherry picked from commit 96f4bfc6ce6bd783a9d21d064eb4ad43be3b2a57)

commit 6a0aa04df1135bd82f12fd03d2f715eded526fea
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 3 11:21:02 2009 -0800

    requires_resume_key is a bool not int.
    Jeremy.
    (cherry picked from commit 7ae10fb892084b821f29dd36287d6deeb360ea13)
    (cherry picked from commit 34040826510a37b8a23dda8429b1520f990b5344)

commit 893b535c2ff510a0c87f96ac4bde12c8fa599b95
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 3 11:19:24 2009 -0800

    Fix more of the RAW-SEARCH test. Older info levels are
    not 4 byte aligned (levels 1 - 3).
    Jeremy.
    (cherry picked from commit 6a61befe3798ecf0996887164f7437c3f25c33f9)
    (cherry picked from commit 10556edffac3f06b5de52cbc50aaff500a511cd4)

commit c51e89390f0001ff1bc114261c3d8b6a2ed12e4c
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 7 10:34:15 2009 +0200

    s3: re-run make samba3-idl.
    
    Guenther
    (cherry picked from commit fea2a78beb1cb4a00f44a4b191f96602cdaa81b9)
    (cherry picked from commit cd2a18bb56b872d730acd61b6bbecef2da5d3cab)

commit 2176e0a8453cd53894e1f27dfbc86beeaf06cdd9
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 3 10:59:18 2009 +0100

    s3: Remove debug_ctx()
    
    smbd just crashed on me: In a debug message I called a routine preparing a
    string that itself used debug_ctx. The outer routine also used it after the
    inner routine had returned. It was still referencing the talloc context
    that the outer debug_ctx() had given us, which the inner DEBUG had already
    freed.
    (cherry picked from commit 172542036aa1047cc7ee95c8e0a33dead6b3076f)

commit 2b9233a026f9e4f80d0b4d71a95068e0a5405c68
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 2 16:17:36 2009 -0800

    Convert from numbers to correct SMB_FIND_XX constant names.
    Jeremy.
    (cherry picked from commit 21e527c5d3d98c6e730c23281d68b0b18737b704)

commit b396c6122f4647c495cb09c924aa877c55d83219
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 2 12:15:25 2009 -0800

    Fix bug 6867 - trans2findnext returns reply_nterror(req, ntstatus) In a directory with a lot of files.
    Jeremy.
    (cherry picked from commit a38592722b05bf81905198c8f244d7303abee030)

commit e8d08259743eb7a7bcbe4e5ee740a244bed293c4
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Oct 1 16:08:02 2009 +1000

    ndr64: added support for trailing gap alignment
    
    NDR64 has a 'trailing gap' alignment, which aligns the end of a
    structure on the overall structure alignment.
    
    This explains the discrepancy we had with the RPC-SAMR test and NDR64
    (cherry picked from commit 6a11a1d720b12889b5cbe6ed1f7751ce0d22d4b9)

commit dbdb289d3dfe2455038dda721dc1e8e152f1151e
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 2 16:59:15 2009 +0100

    s3: Fix a 100% CPU loop when ctdbd dies during a traverse
    (cherry picked from commit 892f92972112e55fdea250c198623d2fd4f70d7c)

commit 522f9349aa6adc6f712d42086791df018d7c8b2f
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 2 13:01:58 2009 +0100

    s3-gencache: restore gencache_get behavior with NULL args (with torture test).
    
    Without this, we panic in wins_srv_is_dead() and fail to start nmbd with
    wins support.
    
    Volker, please check.
    
    Guenther
    (cherry picked from commit f35a1b95aa6f50cb1bc919f4ab502ef2c38f6bf5)
    (cherry picked from commit f39c2577fc649713cfd1e0fb9c164ee4423c96f7)

commit 1db58dedf39af834c6273b13d98398816ab0b622
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Nov 2 12:45:53 2009 +0100

    WHATSNEW: Update release notes.
    
    Karolin
    (cherry picked from commit efbca60e6d3258da997d11fdb126251c89678a01)

commit caace7b5affda538983415ecd7468a46f4405ce9
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 2 10:05:38 2009 +0100

    s3: Make "debug hires timestamp" default to true
    
    It does not cost much and can help a lot when debugging
    (cherry picked from commit cb1b5f93332839eb8fc048895c9c9539f775d9a8)

commit 2db01326e64de16afbf90a6872f863cbc2e96894
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Oct 31 00:45:09 2009 +0100

    s3:ldap: don't search when no values where found
    (cherry picked from commit 54af1851060fca79d064e40acca7dfd3e39b0a25)

commit 5c5dc29fad0236085e08692a6af6225ce11fd93d
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 30 21:50:41 2009 +0100

    Ñ•3:ldap: search for account policies in objectclass sambaDomain, not *
    (cherry picked from commit e5f41591504769b5c7beb5a35bb0f95b33d27a8b)

commit de08e1a54893c5823166c0323d21557bbfb7863f
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Oct 31 10:37:44 2009 +0100

    s3:Makefile: add LIBREPLACE_LIBS for talloc, tdb and wbclient
    (cherry picked from commit 751f087f72fcfedbaeb1b9704b57fbb62d77e5e0)

commit 73483a5a62f4c0e171b02b31dede0e86932eb2aa
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 30 19:54:52 2009 +0100

    Ñ•3:buildsystem: fix depenencies for libreplace
    
    This problem became visible after adding the picky -z defs linker option: On
    Solaris libreplace had unresolved symbols, which showed up in the libtalloc
    build. PAM_WINBIND_EXTRA_LIBS and WINBIND_NSS_EXTRA_LIBS had been workarounds
    to make things work at two placeѕ. These variables have been obsoleted now.
    This patch introduces LIBREPLACE_LIBS which contans the linker flags needed for
    linking anything using libreplace.
    (cherry picked from commit 9568469c6af915b3c58accfe88b42379b3538700)

commit db4a5dac4a6a031240206f83fffbc57f7bb3c4af
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Oct 30 16:47:22 2009 +0100

    s3/docs: Fix typo.
    
    Fix bug #4250. Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
    
    Karolin
    (cherry picked from commit d1ad143a707b36b3aafcbb498554b73d2013f6e8)
    (cherry picked from commit 5087e0ce311c68420c68c285fcdffc5174690621)

commit 278308d42a29d39bbf0f4ce0dda032bf6a391218
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Oct 30 16:31:55 2009 +0100

    s3/docs: Remove reference to nonexistent file.
    
    Fix bug #4252. Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
    
    Karolin
    (cherry picked from commit 52aa522a550de45aa28969d0a679ff4e9b6575d6)
    (cherry picked from commit f6a1bcb69aea271a7afed409530da02595064f71)

commit bdf460c1b650abde63de53850b6c074607e85726
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 29 14:50:56 2009 +0100

    s4-smbtorture: skip bigendian tests against s3 in RPC-LSA-SECRETS.
    
    Guenther
    (cherry picked from commit 3587bb63e21c3f033a17bb493dceb64b05fe85d6)
    (cherry picked from commit e7fdabff1fb8adeb6a58521811adfc85f41c34f3)

commit fd85a421c2fbb0b9df7ea8ea437abe2257231f16
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 28 15:37:11 2009 +0100

    s3-rpcclient: add deletetrustdom command.
    
    Guenther
    (cherry picked from commit 2f3a40844dbac11345a9aabf4a3edd71bab3fec6)
    (cherry picked from commit 9cc63feb849ea59391f835f659ef8ff07c4d779e)

commit e2fdd8c3620fc216bd791a178e9fd490708a75f2
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 28 14:13:32 2009 +0100

    s3-rpcclient: add createtrustdom command.
    
    Guenther
    (cherry picked from commit fbdda195498a9868b9a11a4e0621fadab1ce0963)
    (cherry picked from commit f547c3b997e56cd555f6133a131b1a3c00fc71df)

commit 962e5aec6815c62ef79577fa3514b259e5b68625
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 29 23:50:20 2009 +0100

    s3-lsa: expand struct lsa_info to carry name and sd.
    
    Guenther
    (cherry picked from commit a98832189a429d7d36eb0decbe66d228061c8cd1)
    (cherry picked from commit 9a2ebc6b33773ca02efeda03c4d699ed28fd3190)

commit f12ee5b9962c07a41230343707522393ed740671
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 29 12:36:30 2009 +0100

    s3-lsa: use switch in _lsa_QuerySecurity().
    
    Guenther
    (cherry picked from commit 820b2f4cfaf0d5a954ed3bbf3e6b74ccdbfebe70)
    (cherry picked from commit 474a8e4d8c2c451c347d0826ca3008507ee20d95)

commit 6326534b44f4c066495f955de5b6608a8e8dc4a4
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 30 12:13:21 2009 +0100

    s4-smbtorture: fix warning in RPC-WKSSVC torture test.
    
    Guenther
    (cherry picked from commit 5e8c86c558360ea3c507dae5b3088aa1c2c97bb4)
    (cherry picked from commit 4522d79d90140f051e1d83a572f67564192ac5d8)

commit fb4887947fcfb8245c17b5b248343761ac4c6dbc
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 28 16:42:44 2009 +0100

    s3-secrets: use autogenerated code for TRUSTED_DOM_PASS struct parsing from a tdb.
    
    Guenther
    (cherry picked from commit 184afaa04ca90e089be0071ffb024a884d9d347f)
    (cherry picked from commit 3b11908e3ae3c98bf3ae4ad0581b756e5cb265ab)

commit 27e5d49f7a2ceda18f4466f8d8c4755f258d6864
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 28 16:21:53 2009 +0100

    s3: add secrets.idl.
    
    Guenther
    (cherry picked from commit e92e33238c79a917db7af9b6dfbf06ebaaba9fd8)
    (cherry picked from commit 4899dc43b0816393c0e3f2d474761d58eee1f1fd)

commit 593136703a2e82e91355649e7c3d65c98f20d3c3
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Oct 29 16:14:12 2009 -0700

    Start fixing the RAW-STREAMS test - ensure that the xattr
    used to store the stream info in streams_depot.so is not
    seen in when enumerating EAs.
    Jeremy.
    (cherry picked from commit 11708ca1ee062e2462651aef82276d4403ebcc8a)

commit 797648bba5cbd88069542701465b2e903c8c6e49
Author: Jim McDonough <jmcd at samba.org>
Date:   Thu Oct 29 11:11:43 2009 -0400

    s3: Fix incorrect rc check of nscd_flush_cache.
    
    At least this only resulted in an incorrect debug message.
    (cherry picked from commit 62d94502ca3f92b663dd30aeec9a78fa42f54ce6)

commit 1a4bd222d67723b12a127615a4844026f58f4e76
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Oct 28 11:21:27 2009 +0100

    s3:configure: only check for gpfs_gpl.h
    
    The header is everything we need in order to build vfs_gpfs.
    
    metze
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit ee13e9c0becc2b4a4d3b233613d5e3e9bfb54938)
    (cherry picked from commit 54d8b2fcb14ee1b165feda764b0c2f16c4a6dc95)

commit 48cdff3e06202c779f0f1314b50cf1e3d153b60c
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 28 11:36:13 2009 +0100

    s3-passdb: move open_schannel_session_store() to passdb/secrets_schannel.c.
    
    Guenther
    (cherry picked from commit a5af824b953a7446ac7ce2e0efc18f0e1ca538bd)

commit 86c14c8ca4a26dd2758970c2a86872f1907d971a
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 28 10:56:01 2009 +0100

    s3-net: acct_flags are uint32_t in net_sam_set_userflag().
    
    Guenther
    (cherry picked from commit 50b1a41bc19c6ca8a9364fe5a95e8bd6ba4f9894)

commit 71580d92a205ce2ed4591fbe7dc85368a4312220
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 28 10:55:14 2009 +0100

    adssearch: dump some more nttime timestamps.
    
    Guenther
    (cherry picked from commit ed9df48953fc3877013e2cf09bc782fce36ea825)

commit 407985d5a46cc8454ffe0083ba3fb001154c94ea
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 27 15:29:02 2009 +0100

    s3-lsa: add lsa_trusted_domain_mapping.
    
    Guenther
    (cherry picked from commit d8f6db0626c6a7e404e98fa708cd29d55ec9e381)

commit 82b39ec8cd5a4f1130de7ae97f651391dbb79150
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 27 15:28:06 2009 +0100

    lsa: add LSA_TRUSTED_DOMAIN access masks.
    
    Guenther
    (cherry picked from commit 6e3444cc8b5c1989c3076f7656289b6226222e45)

commit ee0626ea72c6ecda8bfc7626ce64c1ac6f2a8f2b
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 27 14:59:25 2009 +0100

    s3-passdb: add secrets_delete_generic().
    
    Guenther
    (cherry picked from commit 87c1eb24a5d63bdb53b7400d111ff13fb4d35c48)

commit 8f17d7535e7f5f14f97ede761f8210972720619d
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 27 13:50:43 2009 +0100

    s3-lsa: add lsa_secret_mapping.
    
    Guenther
    (cherry picked from commit cebefbeaeec5acf646964c52862e8337719fafb1)

commit a17c40ca087d29cb4867c51e65023aa709c018a9
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 27 13:49:21 2009 +0100

    lsa: add LSA_SECRET access masks.
    
    Guenther
    (cherry picked from commit c765a61bbff44666d78f80ec2ce87a58f32bd034)

commit f30aa85977c4dfa1b5b4ff0b84a87570ec6ad8b8
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 26 23:47:01 2009 +0100

    s3-lsa: use correct function name in_lsa_RemoveAccountRights().
    
    Guenther
    (cherry picked from commit cd3b6eead757434d32535107746713d9631c15be)

commit 161d8df0f72e35ee8aeed088afa181765d4885c0
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 26 23:37:21 2009 +0100

    s3-lsa: pure cosmetic indentation fixes.
    
    Guenther
    (cherry picked from commit 70e65d3c947b261f1d26d95b620627237a3c4fe2)

commit 26050310165766cc27eda2d44e00c6cddd19c7a8
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 26 23:28:30 2009 +0100

    s3-lsa: use enum lsa_LookupNamesLevel in lsa_lookup_level_to_flags().
    
    Guenther
    (cherry picked from commit 48e7b9e2c0ef95b9e3fbf439ad68ff412c156ebd)

commit cb896ec226fac4503cffbdcbf2fd9b4c9cd4fb99
Author: Simo Sorce <idra at samba.org>
Date:   Wed Oct 28 19:10:08 2009 -0400

    Fix map readonly in smb.conf, it is a single word
    (cherry picked from commit 4b69d99f28478f40a7c8fe96be74cb73198e1fda)

commit a59f01baa45b2839e99af6a338a8d95d54b7d44e
Author: Stefan (metze) Metzmacher <metze at samba.org>
Date:   Wed Oct 28 15:42:47 2009 -0700

    Add in Metze's new code to ndr encode the user.DOSATTRIB
    blobs. Next I'll change the create timestamp and dos attribute
    code to use this.
    (cherry picked from commit 0ef863ad21e017693a821912c96fc69471ffe9fe)

commit d8c9c660f1a452e9cbeb8387ab5aeb021c08bf37
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Oct 28 21:37:08 2009 +0100

    s3:Makefile: rename LDSHFLAG variables to make meaning more obvious
    (cherry picked from commit a4556d443395c56e2ad442b62f20f73cd13e82eb)

commit 802707654b93ca7752bbd29adbe00d6de947224a
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Oct 14 00:22:08 2009 +0200

    s3:net: simplify padding to single printf call
    (cherry picked from commit 53c6c535cde05d4c102381d782f235f0339cf6f0)

commit 6f49375e6dba01a7ce805eb0ef4f19c56dc033f2
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Oct 14 00:19:35 2009 +0200

    s3:net simplify padding to single printf call
    (cherry picked from commit 37ddb05a94342fbb84058c03685c87903e787c48)

commit 8191b317127b2df251540808e565891d0a34724c
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Oct 28 14:33:40 2009 +0100

    s3:net: fix output of net rpc trustdom list
    
    Move some messages from stderr to stdout. When some trusting DCs were
    unreachable we lacked \n's on stdout which screwed up whole the output.
    (cherry picked from commit 83344b34d16e431ca8030585b383db1414154981)

commit 39eef24682328a6e74bf6f8648bdf4287bae7911
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date:   Wed Oct 28 12:48:36 2009 -0700

    Fix bug 6572 - libsmbclient: unable to access 'msdfs proxy' share.
    (cherry picked from commit a227073609eb32b091f2c9e9a12504252ae380b8)

commit 9361d4805cab0600b3f644bf615d1e7e7cad62a3
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Oct 27 16:04:35 2009 +0100

    s3/docs: Document new pdbedit -K option.
    
    Karolin
    (cherry picked from commit 354038f170f2541318336aa72c9f2a0426c6607e)
    (cherry picked from commit b053961f49697b11109b5f8ff82035f8b973b922)

commit 136de8ccd0631132ef9ea807b5813d6cae4feecc
Author: Michael Adam <obnox at samba.org>
Date:   Mon Oct 26 16:07:58 2009 +0100

    s3: pdbedit: add option --kickoff-time/-K to set the user's kickoff time
    
    Use "never" as argument to set this to unlimited.
    
    Michael
    (cherry picked from commit 8fdef14305ae1e32d61c80cb10859d41c5754023)
    (cherry picked from commit 058019838f10833c6023e63233edfbb38f9ee71f)

commit 4a2c033615aaf0c44063d4b3ec963305713913df
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Oct 26 21:20:22 2009 -0700

    Second part of the fix for bug 6828 - infinite timeout occurs when byte lock held outside of samba.
    Fixes case where a connection with a pending lock can me marked "idle", and ensures
    that the lock queue timeout is always recalculated.
    Jeremy.
    (cherry picked from commit b3bb18554d4e414fb960b8d043af464c8b4ac43a)

commit ef2c355a0fe9b26a0b07182e63a44615d7ac1193
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Oct 26 12:16:31 2009 +0100

    WHATSNEW: Update changes.
    
    Karolin
    (cherry picked from commit 855430fcb9a950faa711d586d9ef78abb9a698a7)

commit 8cd321c3add8f7912c671cf96ebf54c2f191b857
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Oct 26 12:11:59 2009 +0100

    s3: Rename new parameter "ldap ref follow" to "ldap follow referral".
    
    This parameter will be introduced with Samba 3.5.0.
    
    Karolin
    (cherry picked from commit f381faa8d6fc2c4205e7d59c91f00324f70ca8b9)
    (cherry picked from commit 7e08fa0ddbe591611a32cf44a7cbd944c8afe9a4)

commit 67315af1bb89c1176e0991e29c23ee4db5d48181
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Oct 26 10:14:51 2009 +0100

    s3:docs: Public is not a synonym for access based shareenum.
    
    Fix build warning.
    
    Karolin
    (cherry picked from commit 35dc481289c28a77f354dd76193d6298de32c66d)
    (cherry picked from commit 7601427a2db1263b0192c1a78d8bacb7eb0b74da)

commit 345e5c7fb7b65aadfa7a7e5fd030c5c936589fbd
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Oct 26 09:49:38 2009 +0100

    WHATSNEW: Update release notes.
    
    Karolin
    (cherry picked from commit 77197f3a610d121efca312d30eda829f30747f45)

commit 92e30a1c0406b27c8a2e27cf33b5c2ab32cd488b
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Oct 26 09:33:37 2009 +0100

    s3:docs: fake dir create times is a global parameter.
    
    Karolin
    (cherry picked from commit 02dd89520215c88c3c90a91a6a6aac8ba412803a)
    (cherry picked from commit 8aafa80a0bf24e6f9d2720f28879c96759f1db6f)

commit 5377d925b4cb60ccf28850f4520754e427d0243b
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Oct 23 22:45:03 2009 +1100

    tdb: detect tdb store of identical records and skip
    
    This can help with ldb where we rewrite the index records
    (cherry picked from commit 2466798cc4cb46e8689d43bae0403119266dbe9e)

commit 0b2a1fa6f4050f1f8e69f618d7a1ff09b362a410
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Oct 23 13:51:03 2009 +0200

    tdb: rename 'struct list_struct' into 'struct tdb_record'
    
    metze
    (cherry picked from commit 1f3ea8778ae8ef7d3333accaf3f1950637d19c98)

commit 77d69cc043b57b394a183f46b0ea210ebcb768be
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu Oct 22 00:11:34 2009 +1030

    lib/tdb: make tdbtool use tdb_check() for "check" command
    
    Also, set logging function so we get more informative messages.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    (cherry picked from commit d94a4d44ea644c82925c5901af491a35f0ba611d)

commit ab95cf4fc8bdd2be1a9214cdbf7c2addc7860573
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu Oct 22 00:10:34 2009 +1030

    lib/tdb: add tdb_check()
    
    ctdb wants a quick way to detect corrupt tdbs; particularly, tdbs with
    loops in their hash chains.  tdb_check() provides this.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    (cherry picked from commit 2e6f7dfa793e0a5c46397dc18f65974c77a73b23)

commit ec8dd191b2234d82a897b61af10b14cf9d88c3dd
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu Oct 22 00:10:54 2009 +1030

    lib/tdb: add -t (always use transactions) option to tdbtorture
    
    This means you can kill it at any time and expect no corruption.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    (cherry picked from commit 12da0557bc3346972d65eaf05a0c80ce0884c4e0)

commit 0da8ecaa3181f8bd6e4e0804eb6267f35bae0fcd
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Thu Oct 22 00:09:43 2009 +1030

    lib/tdb: wean off TDB_ERRCODE.
    
    It was a regrettable hack which I used to reduce line count in tdb; in fact it caused confusion as can be seen in this patch.
    In particular, ecode now needs to be set before TDB_LOG anyway, and having it exposed in
    the header is useless (the struct tdb_context isn't defined, so it's doubly useless).
    Also, we should never set errno, as io.c was doing.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    (cherry picked from commit 2b13c2108f8b746dbe866fc14dd5e6045b0d12ea)

commit b34e3f91dc20d3588f7e661060286fc107d2f16c
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Tue Oct 20 12:19:41 2009 +1030

    lib/tdb: TDB_TRACE support (for developers)
    
    When TDB_TRACE is defined (in tdb_private.h), verbose tracing of tdb operations is enabled.
    This can be replayed using "replay_trace" from http://ccan.ozlabs.org/info/tdb.
    
    The majority of this patch comes from moving internal functions to _<funcname> to
    avoid double-tracing.  There should be no additional overhead for the normal (!TDB_TRACE)
    case.
    
    Note that the verbose traces compress really well with rzip.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
    (cherry picked from commit 97973362b405e365b9249d95da02ebf3465bb4e1)

commit 5613d608bd3d7d60852b22fb7a0fc040b0d7e131
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 23 12:07:08 2009 -0700

    s3:Makefile: add some explicit dependencies to libc
    
    Add libc as explicit dependency where we use "-z defs" linker flags. This is
    to silence the Sun linker. Otherwise it whines:
    
    malloc  ... (symbol belongs to implicit dependency /lib/libc.so.1)
    (cherry picked from commit 129cd3b703f53f21102edbc480f03e2af7fe8a58)

commit 7e99eb1030dc6358c56dabcdec45ce2c60981555
Author: Barry Sabsevitz <barry_sabsevitz at hp.com>
Date:   Fri Oct 23 11:50:29 2009 -0700

    Fix bug 6802 - A created folder does not properly inherit permissions from parent.
    (cherry picked from commit e6922418846b7ffc42d8d6db4c5a08385dd365fe)

commit 9df2ecc85574d6068f510d21b1b5e4b1b4b7459f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Oct 22 18:45:43 2009 +1100

    s4-torture: fixed double free in libnet_group test
    (cherry picked from commit d8d28f74aabce7c02c25c2c1543ebea0355d68a8)

commit 14f030efa1343d88da4c1aba22b13d70411d3c8c
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Oct 22 11:03:27 2009 +1100

    util: fixed place where we could look one byte past end of string
    
    We need to check the length before the value
    (cherry picked from commit dcdec1663c1bba90ebe59abed0d0f70772f0eb64)

commit 8a549a9b30fe60a10991baa548632ecf98e34b82
Author: Bo Yang <boyang at samba.org>
Date:   Sat Oct 24 09:20:00 2009 +0800

    s3: Fix crash in pam_winbind, another reference to freed memory.
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    (cherry picked from commit b9a3f1dd85d168c15df846dba525f4f882d1acf8)
    (cherry picked from commit b46f0a7bda7101517435ef612c68e81976d15102)

commit e29502c8be550bc18c8c35b3a55e3d5881536e52
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Oct 22 15:26:22 2009 -0700

    Simplify the logic.
    Jeremy.
    (cherry picked from commit 2b02c9786fc96277bc18bb088c202d3a71df8868)

commit 957ae084451fde4b455b5cb4f3d32c60aacfcaa3
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Oct 22 15:06:38 2009 -0700

    Fix bug 6829 - smbclient does not show special characters properly.
    All successful calls to cli_session_setup() *must* be followed by
    calls to cli_init_creds() to stash the credentials we successfully
    connected with. There were 2 codepaths where this was missing. This
    caused smbclient to be unable to open the \srvsvc pipe to do an RPC
    netserverenum, and cause it to fall back to a RAP netserverenum,
    which uses DOS codepage conversion rather than the full UCS2 of
    RPC, so the returned characters were not correct (unless the DOS
    codepage was set correctly). Phew. That was fun to track down :-).
    Jeremy.
    (cherry picked from commit 322f0769b7a0cad2f5ee9be1b89676c2461d681b)

commit 18b897798bfc90f3bca033d26119bcd47f7e06aa
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Oct 15 18:27:57 2009 +1100

    s4-torture: catch bad command line options
    
    It is annoying when you mistype a command line option and aren't told.
    (cherry picked from commit 44b0dcefb70cd8ffd18f6513c655c137fdd1985e)

commit b0344608ea46649797d130895f7b7b5cb1a70cec
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 20 16:34:42 2009 +1100

    s4-torture: fixed a pipe leak
    
    The RPC-SAMR-PASSWORDS* tests could leak RPC pipes, causing an
    overallocation of fd's on the server
    (cherry picked from commit 3e447ed62138fff14493a76a95a7fd2755e467f0)

commit 6c3a03e91e0b09dda2fe22fa9b2316bd572217e8
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 20 14:27:57 2009 +1100

    s4-torture: fixed a fd/mem leak in the RPC-LSA-SECRETS test
    
    This test left a large number of lsa pipes open, which could trigger
    the server running out of fds
    (cherry picked from commit 9f68deb48c7264c89f7f235306ef0f14dcfc6865)

commit c1b4ba866542429084bc44de8de5df2e96e4a1b3
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 21 02:18:54 2009 +0200

    s4-lsa: Fix dcesrv_lsa_EnumTrustDom() and avoid infite windows client loop.
    
    Found by RPC-LSA-TRUSTED-DOMAIN torture test.
    
    Guenther
    (cherry picked from commit 4b6cfbb6d27eea07400d0eacb08b2f69724b19ca)
    (cherry picked from commit b2b836330c7c75130675354937a5609df54718c0)

commit c4382263ecde5654affe680e2b9a7aba4e37ed4c
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 21 02:17:32 2009 +0200

    s3-lsa: Fix _lsa_EnumTrustDom() and avoid infite windows client loop.
    
    Found by RPC-LSA-TRUSTED-DOMAIN torture test.
    
    Guenther
    (cherry picked from commit 209a65bc6f783055f3f6a8cea3fb36587d346511)
    (cherry picked from commit e91e37485290c1c9132009a14488757936dc7e9e)

commit a2c1b1dcaa33c14ae9b57716d7888f901abaf234
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 21 02:16:32 2009 +0200

    s4-smbtorture: test whether an lsa_EnumTrustDom implementation would hang up a client.
    
    Guenther
    (cherry picked from commit 48520b2274638bde88b08361197c1056936bcba0)
    (cherry picked from commit 1500ee66e7b8d4d0644762aebed9be63b7cacb0b)

commit 1de792f2e815b8092666be429b0d491221114ec6
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 21 02:45:21 2009 +0200

    s3-lsa: make s3 pass against RPC-LSA-LOOKUPNAMES again.
    
    Do what W2k8 does and return the builtin domain for a NULL name.
    
    Guenther
    (cherry picked from commit 32f2cc448778ec6eeab8bbd42d459f7e57b188ac)
    (cherry picked from commit e669b7a668b529bf239aad1039f3ce7d1e011bc4)

commit 7de8e593bd0d13bfcf6379f86d7792081626b4b2
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 21 02:44:44 2009 +0200

    nsswitch: fix the build of the winbind krb5 locator plugin.
    
    Guenther
    (cherry picked from commit b9d9353b548d9b2ab684aa171f511174e6414762)
    (cherry picked from commit d48513e216cf8f9084dcb20454503d161aa232d7)

commit d1ad22889d27f8dfadc1128b947c78126511f5e8
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 23:47:40 2009 +0200

    s4-smbtorture: fix RPC-LSA-LSALOOKUP test against w2k3 and w2k8.
    
    Make sure to split out lsa_LookupName NULL name test so that we can better track
    results from bogus names and NULL names.
    
    Guenther
    (cherry picked from commit a4d54875768bbe6bcd019a788081d182ce9d4a80)
    (cherry picked from commit f8706bef307b1de684ce91ed2e5ecbda7695db09)

commit 2f0bfba4069317608d886e82b9642715420f3d99
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 20 17:53:06 2009 -0700

    Turn on LOCK9 test which will test for regressions in bug 6828.
    Jeremy.
    (cherry picked from commit df0430e1c3753d4adbcbbdc717bab466c3a934ff)

commit d1a97de83a55cbb9ef6005525b7d1a475323a69c
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 20 17:52:34 2009 -0700

    Fix bug 6828 - infinite timeout occurs when byte lock held outside of samba
    Jeremy.
    (cherry picked from commit 573c2cc5c54ea3d46ac729c3e0e5a8eb6b6799ea)

commit 8efba1f5c7c53134e6fdf3c62e672848683f1997
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 20 17:41:27 2009 -0700

    Fix comments on new test.
    Jeremy
    (cherry picked from commit 8db60c4a9bbcc5512091396dee49a7efa13d904f)

commit 7636ccb602d2953bf40bb85161f6de805f30a368
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 20 17:37:43 2009 -0700

    Add local (or NFS) lock test to smbtorture. Checks that local locks
    conflict with CIFS locks (see bug 6868).
    Jeremy.
    (cherry picked from commit a016f4ddc8e7e4d209f4c13cbfb444c92d3245db)

commit 93fc329e4d59808b2c41663ae7964c3fd955b90a
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 20 13:42:28 2009 -0700

    Fix "make install" by removing all references to python. Not currently
    needed in source3, and isn't working anyway.
    Jeremy.
    (cherry picked from commit 9c7e31b64ca0564825d24c382cd9ac5f1d90ffdc)

commit b32fb1a761ee8c68c071eb7e2322333d459cc18d
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 20 13:28:05 2009 -0700

    Remove pythonmods from the build in source3, it doesn't build anyway
    and isn't needed (as far as I can tell).
    Jeremy.
    (cherry picked from commit 20d95929295a7cb16a49b0e172856eca7b5ea3b5)

commit 04ecf8ed5584f23c448229348000db102eea3d73
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 20 13:09:42 2009 -0700

    Fix the pam_smbpass.so build with the recent linker flag changes.
    Jeremy.
    (cherry picked from commit 7034ef40040a940bf31266263067f4c3bb85f02a)

commit da749e1babe62a2f16d45f93917156c5657e070d
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 18:34:09 2009 +0200

    s4-smbtorture: Make it simpler to specify number of trusted domains to create in
    RPC-LSA-TRUSTED-DOMAINS.
    
    Guenther
    (cherry picked from commit 9ee5d8466513a957128fcf511529fcd76fa3f05b)
    (cherry picked from commit 6972bf282c752581257119a847e821090c5b80de)

commit d0a32b6b84651777ba053e779de36bc2172b6962
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 18:35:49 2009 +0200

    s3-lsa: Fix _lsa_EnumTrustDom().
    
    Windows clients were showing a lot of duplicates in their list of trusted
    domains.
    
    Found by RPC-LSA-TRUSTED-DOMAIN torture test.
    
    Guenther
    (cherry picked from commit 49a13234957ad241e6457bbf0edc15875321f03f)
    (cherry picked from commit 23d93c7e34a2de576c0233dfdb2119087fc34645)

commit cf93986ebd242b5f9a1039f36268cb113c4a2d16
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 18:35:16 2009 +0200

    s3-pdb_ldap: fix crash bug in ldapsam_set_trusteddom_pw().
    
    Thanks Volker for the hint.
    
    Guenther
    (cherry picked from commit d168d7fe3c7ec4b90cd526c4ea02e972ffac7835)
    (cherry picked from commit 157f377eba415b97edc23657ba4db305d9e16cc3)

commit d83378bb5a0cc890165ec186607bb15c46492d65
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 15:54:40 2009 +0200

    s3-lsa: Fix _lsa_CreateAccount() for usage of SEC_FLAG_MAXIMUM_ALLOWED.
    
    Found by RPC-LSA-PRIVILEGES torture test.
    
    Guenther
    (cherry picked from commit a5a7b9ebc220b6477c987fe5552561c41e9d1b85)
    (cherry picked from commit db628ea5dcd44e721ab55fe69ab99012548b6ac5)

commit 5912dd76af7f5e4a3dd26bacf69c2d2e091ed1f1
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jul 16 18:46:10 2009 +0200

    s3-selftest: enable RPC-LSA-PRIVILEGES against Samba 3.
    
    Guenther
    (cherry picked from commit 870f2d336a57f16ed5f1018ced6fa4ef5d61539c)
    (cherry picked from commit 74c50fbd70d85a5cf124866d4095cff54debd10a)

commit 48ad5a322561abb0062694e4ec0424bf362a2d08
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 15:09:32 2009 +0200

    s4-smbtorture: Fix wrong comment in RPC-LSA-TRUSTED-DOMAIN test.
    
    Guenther
    (cherry picked from commit 7e180101d3a460d30da7b5043034ef306913b2d1)
    (cherry picked from commit 1c34c07a843e64eb00715f75de911ff2c10619f7)

commit d798777e80ce7796adfb540d0f4135c192aec273
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 12:59:49 2009 +0200

    s4-smbtorture: split out EnumTrustedDomainsEx test in RPC-LSA-TRUSTED-DOMAINS.
    
    Guenther
    (cherry picked from commit bf2746b537484a51b55a3000e4c34d08bd5aff7a)
    (cherry picked from commit 42b21db724de27f27ec039064a467dfe6311c5c3)

commit e95c8d600372789c7ce248c4b756571b58145910
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 15:15:06 2009 +0200

    s3-lsa: Allow to lookup 'NT AUTHORITY\Anonymous Logon' as well.
    
    This is to finally pass RPC-LSA-LOOKUPNAMES test.
    
    Guenther
    (cherry picked from commit c7023c5a3dc1644e9b8ae667f7f9d6d1dfe49bb1)
    (cherry picked from commit f22f21cea39e90ddf08edd3bd12c127aa176a271)

commit 6550b7ff352ad4c35589975295451d616ba98deb
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 15:13:56 2009 +0200

    s3-lsa: allow to lookup BUILTIN\ in lsa_LookupNames.
    
    Found by RPC-LSA-LOOKUPNAMES torture test.
    
    Guenther
    (cherry picked from commit 1f4d26c4870989c5a0aba773c97172f0c0185aba)
    (cherry picked from commit f59b0c9d38e2e64ed880015e3250bdd519c34afe)

commit bca766553e67d263d80fd12d2679f70d865e5a66
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 15:12:58 2009 +0200

    s3-lsa: When looking up domains in LookupNames, do not strip the sid.
    
    Found by RPC-LSA-LOOKUPNAMES torture test.
    
    Guenther
    (cherry picked from commit 18dd62616028cf202f63a12c20d5e21e390451b6)
    (cherry picked from commit 6e954e87bd6af7e3c3cf8802edfd9808226691ea)

commit 9501430584f86e7f25691614eb5b749b747bead7
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 15:11:58 2009 +0200

    s3-lsa: allow to have NULL strings in lsa LookupName queries.
    
    Found by RPC-LSA-LOOKUPNAMES torture test.
    
    Guenther
    (cherry picked from commit b6d97a00b13fc338f6fef3c5587619821d86194c)
    (cherry picked from commit 2d09c8f5dfa489767ee980696b32c30e222b07d6)

commit 4fb62be8e296487078247269f31cc40e493757f3
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 20 15:00:55 2009 +0200

    s4-smbtorture: add stricter tests for LSA-LOOKUPNAMES replies.
    
    Guenther
    (cherry picked from commit d76e77ce9a72543727ff83eacbefed22f0c644b9)
    (cherry picked from commit 0bf4f0bfecc6ec06187aafaabc0fbace4de3fddc)

commit d9ed23936bf8d1fcc870ac573379c6f3991d1c45
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jul 16 00:52:28 2009 +0200

    s4-smbtorture: move all LookupNames tests into RPC-LSA-LOOKUPNAMES.
    
    Guenther
    (cherry picked from commit 80b512fe03e692f630375c39f84ae9f91f5b333a)
    (cherry picked from commit ae0ae7b46beb5aa38e94f36a5d238fef2256131c)

commit aca7c592de3b3580e8072dd96d09ddeee4d09095
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 19 16:54:37 2009 +0200

    wbinfo: use wbcLookupDomainControllerEx for wbinfo --dsgetdcname.
    
    Guenther
    (cherry picked from commit 10bd52184959335d779aae52f9178c0441c70da9)
    (cherry picked from commit a63fb1555646dbfbcc993fc298aa4b51bee77eed)

commit dd397285472dbbe3363cdf1a031e4c0fe9ccfa55
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 19 16:55:15 2009 +0200

    libwbclient: fix wbcLookupDomainController().
    
    Found by WINBIND-WBCLIENT torture test.
    
    Guenther
    (cherry picked from commit 110a40d4bc043d2bb2316480e6ba66ece1bf04ad)
    (cherry picked from commit f5a5c2613bd7ff64cb86fdb9e508d243033a32c8)

commit 59b0399abab0d2e316a4442ca37440b459a34316
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 16 13:39:24 2009 +0200

    s4-smbtorture: test wbcLookupDomainController{Ex} in WINBIND-WBCLIENT.
    
    Guenther
    (cherry picked from commit 71cfbf958cbb26dcc050bab9fd05b38556128d4f)
    (cherry picked from commit 95aab5556b1bd7eda726e908302fb51f49da3717)

commit 70f55bf8d591e752687b3e370e27556909a64f60
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 19 18:41:15 2009 +0200

    gitignore: remove old netlogon prototypes.
    
    Guenther
    (cherry picked from commit dbd03997e1af1e659507b1142f29d0463e8ad295)
    (cherry picked from commit e01b09b6f71ac9f5f7a03eaba4eb6692c7c0c17f)

commit daa4d61befd964dba24ae6a1de2883924f40dba2
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Oct 20 08:01:52 2009 +0200

    s3:configure: add support for Solaris' ld -z ignore
    
    try linker flags for ignoring unused libs in this order:
    -Wl,--as-needed (gcc like + binutils)
    -Wl,-z,ignore (gcc like + Solaris linker)
    -z ignore (old Sun C)
    (cherry picked from commit 4d5f14bfd3c5de9887145caa53c3f08a7fe75a1b)

commit 49b768a7f6f0ac0c889417ad1f459229e056f2cb
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Oct 20 01:13:56 2009 +0200

    s3: make unresolved symbols in libs throw errors
    
    except for the Samba internal plugins unresolved symbol references should not
    show up in shared libraries. For historical reasons it's the default behaviour
    of linkers to ignore those in shared libs. We use -z defs (alias
    --no-undefined) to not ignore them in shared libs.
    (cherry picked from commit 7aaec4fe68ce23b0b5880badac378f5ca4386389)

commit 19a2b0221e57266e2fb658b03494b3d884a5778f
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Oct 18 22:51:06 2009 +0200

    s3: allow using different LDFLAGS for internal libs/plugins
    
    internal libs have unresolved symbols intentionally.
    Thanks to Buchan Milne for suggestion and patch. This addresses #6792.
    (cherry picked from commit 78e8d767877621fc34de9c7bb96837f82e80e358)

commit 1b1194759bef61101bdb4ffde23358e0a723b4eb
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 20 13:00:12 2009 +1100

    s4-dsdb: fixed empty structure error on solaris8
    
    Nadya, I'm guessing you plan on adding some real elements to this
    structure later. For now I've added _dummy so the build can continue
    with the Solaris C compiler.
    (cherry picked from commit 13ff1f6c01f8f79b63bd62fb6e5edff0b34439bd)

commit d19545a45043044f4a1a14feb6364a95cd0a378b
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 20 12:13:15 2009 +1100

    s4-idl: don't call a variable 'stat'
    
    never call a structure member by the name of a standard C lib call. It
    breaks the build on some systems.
    (cherry picked from commit 4f1a1bf8a4afe82e35d9a4d545255d63201f269a)

commit b0095f92f59894c8ddc3313b3f3773372a18ef29
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 20 11:34:49 2009 +1100

    lib-util: check for too many combinations in generate_unique_strs()
    (cherry picked from commit e94c54ff3c83d0d19e0157216632bc99d5f8d0e3)

commit bdbd0f23cbd53ed0323c6aa80c33a7cdf0e6e4a0
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 20 10:59:40 2009 +1100

    tdb: fixed the intermittent failure of tdbtorture in the build farm
    
    There was a race condition that caused the torture.tdb to be left in a
    state that needed recovery. The torture code thought that any message
    from the tdb code was an error, so the "recovered" message, which is a
    TDB_DEBUG_TRACE message, marked the run as being an error when it
    isn't.
    (cherry picked from commit 7e75d3c4fa1a7a6d3c967d6f108df0ab2ffa02ad)

commit d0e82261a1f54af593e542ec08c4dbb44d9e6c3f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Oct 19 22:47:45 2009 +1100

    util: fixed generate_unique_strs() to be portable
    
    'place' was going negative, and giving undefined results. The result
    was duplicate names which gave errors in SMB2-DIR on PPC and other
    systems.
    (cherry picked from commit 72ae44918a6c8e0a11747441f2bbd5152022f98c)

commit 1baaaf885740e16e8db9a08316d02b185b795801
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Oct 19 10:40:15 2009 +0200

    s4:test: Fix typo.
    
    Karolin
    (cherry picked from commit b7b548411c3868bb6008d0221ac59e56fdd5aefe)
    (cherry picked from commit 1a300b7a345f962591e356335aed005a8c304711)

commit 75e7e2af09a405eecc261f63e8f3d452fdee517d
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Oct 19 09:47:33 2009 +0200

    Fix typo.
    
    privilage -> privilege
    
    Karolin
    (cherry picked from commit fa08d0b44bf80f6caaeb004a0f27d8346c2820e2)
    (cherry picked from commit cf0617b40ba2affa4f2135cc44741afa71b967e3)

commit ac366c2c3b734e2d508ce23b94ef03ac9b325d5d
Author: Bo Yang <boyang at samba.org>
Date:   Thu Oct 15 06:23:48 2009 +0800

    s3: Don't fail authentication when one or some group of require-membership-of is invalid.
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    (cherry picked from commit 31f1a36901b5b8959dc51401c09c114829b50392)
    (cherry picked from commit 5d62b2fcce7d846bf5adb4407c05d281afa6a9e9)

commit df0454f97d9a901a5890ff19d9aa0839473babd8
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Oct 18 17:01:57 2009 +0200

    s3:configure: fix avahi activation
    
    Avahi was correctly found but not activated since e4a26c942.
    (cherry picked from commit 355570499426ec126ea84853e0d7e1a9aa690980)

commit 3532b67904252708f9e0c3dbab473b481aed633c
Author: Jeremy Allison <jra at samba.org>
Date:   Sat Oct 17 20:47:47 2009 -0700

    Fix posix_unlink test. Was doing grep without quotes around the
    target string.
    Jeremy.
    (cherry picked from commit 404f744772ab68ac5a4722818d447609c33a39b7)

commit 69c55e4d7aa58779d97bcdac92130608ee265d0d
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 16 18:13:06 2009 -0700

    Add comment explaining about symlink following & posix.
    Jeremy.
    (cherry picked from commit 62620e9654fba8cdc7b070db205b1ca8ff3aade0)

commit 54ac75b82fe25b0c0ea149a1d9fe0ab5e05c0965
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 16 18:01:19 2009 +0200

    s3-netlogon: fix updating trust accout passwords with downlevel domains.
    
    When choosing the netlogon password set function, make sure to look at the
    *negotiated* flags in the cli->dc state, not the ones we start the negotiation
    with.
    
    Guenther
    (cherry picked from commit 96b6d67c381b0c6078678ed74342b6fcd0f04a6b)

commit 931f962a261924b926bf24754cc2251b5d660433
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 16 17:20:40 2009 -0700

    Last 2 VFS_STAT -> LSTAT fixes I can see in the modules code.
    Jeremy.
    (cherry picked from commit 90a291f9581150d8a00fbb5e784f0b034f563d04)

commit 9d4479655324c161d3cee480f13c1cd9d31330d2
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 16 16:37:20 2009 -0700

    Fix one missing STAT -> LSTAT with POSIX pathnames in vfs_xattr_tdb.c. Caught by the torture tester. I love unit tests :-). Jeremy.
    (cherry picked from commit 9180559b4ab26813699d3c1410b3fc1b775b0e1d)

commit de215dcadc4c0753715945595b6420227f832a31
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 16 23:40:34 2009 +0200

    s3: build pam_smbpass when possible
    (cherry picked from commit bf684180b0bdc93438ab86b102e5883d70bcea6a)

commit 420d13c107355834ec0754a8b58a193402bc7062
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 16 16:07:31 2009 +0200

    nsswitch: increase libwbclient version after adding wbcChangeTrustCredentials().
    
    Guenther
    (cherry picked from commit 20c07674f6c0b9423c13b9876dbe4d12f86e0d72)
    (cherry picked from commit f2b94302ba7b30703b2edbdb5272582cff03fff9)

commit 98ac025b0358eef5e3ca7cdc6169023ea6e41d3b
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 14 11:58:21 2009 +0200

    s4-smbtorture: extend netr_LogonControl test in RPC-NETLOGON.
    
    Guenther
    (cherry picked from commit 22276961c398da5997402f09f7443d76f621d3ec)
    (cherry picked from commit 823a1c4024003aa69ae7c918dfa3c0fcec12498e)

commit 367c3339c53fb303b6c7bd02c71adb7734c5e350
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 16 12:09:55 2009 +0200

    s3-netlogon: Fix _netr_ServerPasswordSet2 cleartext blob handling.
    
    Following Andrew's advice, let's straight md4 the plaintext blob and avoid
    trying to get a paintext string out of the input the client sends.
    
    Guenther
    (cherry picked from commit 8267564e1c52b3d335bf892ab71963bfb0e6e7e8)
    (cherry picked from commit 7cebe583a305de03dd53df31de566cb3dea1c0f8)

commit 66ec7f6813b65cca9bb92733a8cb929677d4a267
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 16 14:51:49 2009 +0200

    s4-smbtorture: test wbcLookupUserSids in WINBIND-WBCLIENT as well.
    
    Guenther
    (cherry picked from commit c2966a0766998b732c190860879c001d6140863e)
    (cherry picked from commit 227558fb3bbe037b812f5cf202701f9bf28af919)

commit b955d6b12d5f44004a588ae244060ba943f8947b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 16 13:38:57 2009 +0200

    s4-smbtorture: test wbcGuidToString and friends as well in WINBIND-WBCLIENT.
    
    Guenther
    (cherry picked from commit 246597cb0d8d62c702841dfbb3fa257fc2da70da)
    (cherry picked from commit 5e295ada507a50a135759d2c70cbb8195546d2b7)

commit d6c154d75e89dcddcef6e0fc2ce2d9ef51d2b726
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 15 01:04:27 2009 +0200

    s3-libnetapi: add nltest tool.
    
    Guenther
    (cherry picked from commit a85799d5db9e8dcbb6f12299dc5ff31485c0617f)
    (cherry picked from commit f44ee3f5297470fd319204c1b6aef6e8398921f9)

commit b02e4cde0b3d1d8948623ed09feb247c52fb0fa3
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 13 16:47:32 2009 +0200

    s3-libnetapi: add I_NetLogonControl{2} example code.
    
    Guenther
    (cherry picked from commit ca19ffde80df80aa8a58b0ad141e712f3f60ad81)
    (cherry picked from commit 1b51be2a75420c1ac71e25420c9a6a950bd7ecd0)

commit 33efd6f1c0e6baa29d7d644e9c5e740e33c64b69
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 13 16:46:54 2009 +0200

    s3-libnetapi: add I_NetLogonControl{2} to public headers.
    
    Guenther
    (cherry picked from commit d308aa3de86f4d5d66d4f618fb3dd3fcf65a3992)
    (cherry picked from commit e3b92680b6ad378a2ae286fe446d1a0dd5a7140b)

commit 291ebdf3df15bff56a0d8021a7702db476f0ca38
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 13 16:03:58 2009 +0200

    s3-libnetapi: fill in I_NetLogonControl{2}_r.
    
    Guenther
    (cherry picked from commit e31c2c7eb1f015774ad0adb3af8110f467461878)
    (cherry picked from commit 48678f46a0f681bf23f9d93c6c0709e377f210e9)

commit b7ab595e1a879cbe23eefa9169f427af22638ac6
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 13 15:47:56 2009 +0200

    s3-libnetapi: add I_NetLogonControl{2} skeleton.
    
    Guenther
    (cherry picked from commit e8e1d609411c37b5839e5b50b95f07691370c247)
    (cherry picked from commit 3f7a17c57b67a452c337316884de3a7cd250c66a)

commit 189dd84185ee439eb2cdcebbb9424f94149d89df
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 13 15:39:27 2009 +0200

    s3-libnetapi: add I_NetLogonControl{2} to IDL.
    
    Guenther
    (cherry picked from commit 8bd4378ff8ddc81710575a21ca7713195a105b52)
    (cherry picked from commit 4df0e57ad0c66f99c4ffae4a35a8452cd49a3907)

commit 949f6ba0438f26bf7cae4adae83e549516fc9a23
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 16 01:58:49 2009 +0200

    s3-selftest: enable WINBIND-WBCLIENT against s3.
    
    Guenther
    (cherry picked from commit 3f80b06d9ed9d1aabb56168ccee90d7d945de8ed)
    (cherry picked from commit 8dcf3e3009073cdf45b0736671bd4ecfe0baabfd)

commit c3fafd5b8d2d2dbd44bbd0ed5a2a67f982580eac
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 16 00:33:38 2009 +0200

    s4-smbtorture: add very basic libwbclient testsuite.
    
    Guenther
    (cherry picked from commit 612deb2699c87fc05b98290e1791493603e7b686)
    (cherry picked from commit 27e64f5fe99ff49e2153c0046399d1c58cc36b56)

commit 332cbb17c0d4096d51bf6b19cc6fac677dab20c7
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 16 01:59:08 2009 +0200

    s3-net: fix build warning (missing default in switch).
    
    Guenther
    (cherry picked from commit 8b247f35389a899c805d018adb92f372e562a378)
    (cherry picked from commit c2281ae03020144da20e49cfd2cde09ee542cf34)

commit 3c31225b174799d92087fe410d2dae4a7158a414
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Oct 16 16:00:26 2009 +0200

    s3:packaging: Fix building RHEL packages.
    
    Fix bug #6721.
    Thanks to Eero Volotinen <eero.volotinen at medicel.com> for providing the patch!
    
    Karolin
    (cherry picked from commit 79c2c61b99eb7c47c8bfbbb479d9d2197d1ad1fb)
    (cherry picked from commit 11a6d88ea387fa50690880561f0ffffefbeb8956)

commit da314d9698c09391893c798b85729b49e1cf037f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Oct 16 10:04:26 2009 +1100

    s4-torture: take privileges into account in BASE-MAXIMUM_ALLOWED
    
    The correct answer depends on the users privileges.
    (cherry picked from commit 8395c1d67e64c5fcfe51305fb7cfd86a592b128e)

commit 69d3ec018a7aff81a8f04399524c36d41675732a
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Oct 16 10:01:28 2009 +1100

    idl: added bit definition for privilege masks
    
    When you have backup or restore privileges, you automatically get
    extra access bits in ACL interpretation. This adds definitions for the
    bits you get.
    (cherry picked from commit 4e3ea9e0da8e2f7d99b76114da4bca46c15d188c)

commit d788ca62a7a1d1063392c193c9f0f379b94ab940
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Oct 15 16:55:40 2009 -0700

    Fix valgrind memory leak in bug #6814 - Fixes for problems reported by valgrind
    Jeremy.
    (cherry picked from commit 218d5880420ea7b16b30b782de27d7ff9d1083b4)

commit fba1a7d5776de300249cd1e1557fec0e44cda7df
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Oct 16 10:40:50 2009 +1100

    s3: fixed krb5 build problem on ubuntu karmic
    
    Karmic has MIT krb5 1.7-beta3, which has the symbol
    krb5_auth_con_set_req_cksumtype but no prototype for it.
    
    See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=531635
    (cherry picked from commit 156560a00c08e4c1ab2fca7ba14329db70271553)

commit cecf543ff07d5592e22d2e12fbca7c20a7aee3ff
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 15 15:45:20 2009 +0200

    s3-spnego: fix memleak in spnego_parse_auth().
    
    Guenther
    (cherry picked from commit ef194bc692d4bb5fddc2c437ce66aa32080ca2dc)
    (cherry picked from commit aece18c5047479b77b87451f07f3e2cd304ea205)

commit 4c580459aa0b5921ffc954c7c20c6c5010133424
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 15 14:13:26 2009 +0200

    s3-spnego: Fix Bug #6815. Windows 2008 R2 SPNEGO negTokenTarg parsing failure.
    
    When parsing a SPNEGO session setup retry (falling back from KRB5 to NTLMSSP),
    we failed to parse the ASN1_ENUMERATED negResult in the negTokenTarg, thus
    failing spnego_parse_auth() completely.
    
    By just using the shared spnego/asn1 code, we get the parsing the correct way.
    
    Guenther
    (cherry picked from commit 449ab398f58c6e0041621752322ebe24e6d70225)
    (cherry picked from commit 7936874af1ab8b2449af41f38695b2946813adf7)

commit c13db8c57cf215e84cd0178db229745f0b8399d4
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 14 17:42:19 2009 +0200

    s3-build: we need to have talloc 2.0.1 when building with external talloc.
    
    2.0.0 did not got the exports right.
    This and the 2.0.1 talloc fixes resolve bug #6808.
    
    Guenther
    (cherry picked from commit 67b544ba968d08cd861fc2d6d5b8a0881880b0aa)
    (cherry picked from commit dfd22e3c5dd21b62b9509c1a9781aaa671b528b3)

commit abdaf1b1a50323f5458ac6bfb29d7a8d3db9fdd3
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 14 11:48:59 2009 +0200

    s3-passdb: missed two prototypes while moving to enum netr_SchannelType.
    
    Guenther
    (cherry picked from commit 075303560f545e59128a1bb16d6128a165830288)
    (cherry picked from commit d4d2bbff2fd300d8c7001e3ee65d4c854a431ad9)

commit 5f4fc0ef5cb31ddb4a2a1fdddf453d595b9ed3dd
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Oct 15 12:27:24 2009 +0200

    s3/docs: Add missing meta data to man ldbrename.
    
    Avoid warnings.
    
    Karolin
    (cherry picked from commit 6a9e88e08bfa4463ce5bdc57183f6518b524c98c)
    (cherry picked from commit 1a25ef232bacb59aa753fbe21fed53a996d2e6b3)

commit ae9ec5cc3c87a0f9c76a2ca32330d2e11e2d6121
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 14 12:36:02 2009 -0700

    Fix the build, missing ->.
    Jeremy.
    (cherry picked from commit 9535d43484d299f716e8f58a2b511b7abf4332da)

commit fa0e325e43327b1120a66769b178141e3199c8d3
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 14 11:11:26 2009 -0700

    Final part of fix for bug 6793 - winbindd crash with "INTERNAL ERROR: Signal 6"
    Don't use mapped_user uninitialized.
    Jeremy.
    (cherry picked from commit 4c8175c1ce2696a3834dc7a8d56e9f3a786c33a4)

commit 982256d40e6e0d971bfe38cbf199d819e7ca2ea8
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Oct 13 20:56:28 2009 +0200

    s3:winbind: Fix a double-free
    
    Part of a fix for bug #6793.
    (cherry picked from commit a3713a55ab5f5c75ae042a0ba1c97424bea3abf7)

commit 7dfba1bc5cd87651aee8c6eb30f4a755c80215c8
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 14 11:14:57 2009 -0700

    s3:winbind: Fix bug 6793 -- segfault in winbindd_pam_auth
    (cherry picked from commit 12cabf9ae8772bfc83b571f918bd8c74d62e1564)

commit a1a9d999e1da54b90cdf7e0ac03d097191a2d197
Author: Bo Yang <boyang at samba.org>
Date:   Thu Oct 15 04:31:26 2009 +0800

    s3: Fix reference to freed memory in pam_winbind.
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    (cherry picked from commit a94f0a5d8b2fa10972aef379a7137817c2ec0deb)

commit 96bb7d05204dea89901de4b257680e01115b3fc8
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 12 17:29:45 2009 +0200

    s3:torture: Add a notify-bench test
    
    This is a test that creates and deletes files in a directory as fast as the
    network allows it. At the same time, it opens a filechangenotify. This test is
    done to just torture handling a single directory together with the notify
    infrastructure.
    (cherry picked from commit 23b3fade10c5ecb5678e087e9507c527c36bdc48)

commit 1757fabf9b36df30ab6cc548e22aeb1f35b08461
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Oct 12 16:43:19 2009 +0200

    s3:libsmb: Add cli_notify
    (cherry picked from commit bd40e01692ec209d13352d30fa4335c744f1d3ea)

commit a0b1f5173187e6e690a53459384a9f806425c262
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 3 15:33:12 2009 +0200

    s3:rpc: Fix is_known_pipename for dynamically loaded pipes
    (cherry picked from commit 476a5df4a3434687b17e91c0d70d0fd8d0f91c4a)

commit c2bcc317aab1634e1bc84e087dad18685764d34c
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 4 16:52:08 2009 +0200

    s3: Fix some nonempty blank lines
    (cherry picked from commit a85ea69e9971b3c195bced474f61479c8da4616b)

commit b3c239adcbf9e73bf5c4fe11e4cc762113445890
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Oct 13 15:56:00 2009 +0200

    s3:net: Fix a segfault in "net rpc trustdom list" for overlong domain names
    
    That was a complicated way to say "%-20.s"... But that code was from 2002 ...
    (cherry picked from commit b3cc2f70cb672f28f9223cdd165cf505642deca6)

commit 859b839f0e8bc1c02ba72330ff5c19242724f03c
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 13 13:28:57 2009 -0700

    Remove use of "int ret" when we already have errcode.
    Jeremy.
    (cherry picked from commit 75b88390b481545ed1210ea498fba45901ae26e3)

commit d10dbbe073bd4306e4a41851e1eea40f33f71785
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 13 13:03:39 2009 -0700

    Catch one more erroneous use of errno.
    Jeremy.
    (cherry picked from commit 4cbb0fb9f628f08a4bd1fcf08f50a4a1418fe2e7)

commit f9baba3bc4d0143f4ee1d91a77643a5a02e359e6
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date:   Tue Oct 13 15:48:19 2009 +0200

    correctly handle aio_error() and errno
    (cherry picked from commit e5aecfa81d0e496ba972e5fef532e4b6464ff364)

commit 5529289e1d17d0524dc38aea11e0a3469818753c
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Sep 16 03:22:56 2009 +0200

    s3: Fix vfs_shadow_copy2 to allow in-path @GMT-xxx
    (cherry picked from commit 7ff4fc589ce25c48409cdf399e437262b9799223)

commit b0f3a9cd2f73e4c4d36abd2a9f98a67c0a511bc2
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 6 18:26:33 2009 +0200

    s3-winbindd: add wbint_ChangeMachineAccount implementation.
    
    Guenther
    (cherry picked from commit a3306e352dad74c3c6ce441610defc472d570f4f)
    (cherry picked from commit ec646e5e094639f750e56bde4779ab3b0ac23e47)

commit 93c72289805e9639313544f70386a98956a37933
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 6 18:20:23 2009 +0200

    docs: document wbinfo -c.
    
    Guenther
    (cherry picked from commit 0c37c23869fe8000609c91be3d44ba269ff38f3b)
    (cherry picked from commit e3fa32aa37ce913d0daad6aa1b6bb81986dce4bf)

commit 139d21e869fcdea935ad3956e915b4a539d6cc96
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 6 18:18:00 2009 +0200

    nsswitch: add wbinfo -c (change trust account passwords).
    
    Guenther
    (cherry picked from commit 0a468fbe36e6049f8d7f971c1aa111e1573a406c)
    (cherry picked from commit e816b11d564df42a467c7c330f4b75db923d497e)

commit 8d511f103d5cb4dc88760a53906f91e43577a5eb
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 6 18:15:08 2009 +0200

    libwbclient: add wbcChangeTrustCredentials.
    
    Guenther
    (cherry picked from commit 74948c979ab19f20c7e5824aee50828e9bda0e35)
    (cherry picked from commit 507de11191b28b8d14eda43084621e731e7a82f7)

commit 6f399bfa9b706ba68057122f0147810bdf409005
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 13 12:24:57 2009 +0200

    docs: document wbinfo -t --domain DOMAIN behavior.
    
    Guenther
    (cherry picked from commit f394b5bc683d55be066f8565f99d157d9848e169)
    (cherry picked from commit 6a7320d73a51d84cdba08e43c8b50991339de267)

commit 0f09780583db818bd56bba7d3291efa2c1cddbee
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 8 00:34:53 2009 +0200

    netlogon: add NL_PASSWORD_VERSION to IDL.
    
    Guenther
    (cherry picked from commit c2be185793d66709b0b2ddb92845f4dfd0ab27b6)
    (cherry picked from commit b5ab612c5f9b5afd04618b705153fbf5150382f4)

commit 1595ffa883eb5de8a81e519aae1f6344c2c833ee
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 13 10:15:34 2009 +0200

    s3: use enum netr_SchannelType all over the place.
    
    Guenther
    (cherry picked from commit ebe0e64ba9815b238cccf7d24821bc473d245707)
    (cherry picked from commit bf8253211c478280d41e3f8afdf7a97acc9ca898)

commit 7faf7d07c046bc140b4c54f85d6f51a7fab00991
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 8 00:39:40 2009 +0200

    s3-netlogon: allow to change any type of trust account password in trust_pw_find_change_and_store_it().
    
    Guenther
    (cherry picked from commit aa8c142b5e1d126b9a5a8e4a6638bc785292fbc2)
    (cherry picked from commit d1dffa6244fb7b5eb95d3bea9a585d7bd0d92484)

commit 26d7b35d70d991c4f6fba81abb4499c41becfb5d
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 8 00:34:05 2009 +0200

    s3-netlogon: pass down account name to remote password set functions.
    
    Guenther
    (cherry picked from commit 4a1b50afd567313cc25d5bbc14e01e170aa62a00)
    (cherry picked from commit 488e228fc9b469c6b40a372c0f2ff0658e176c27)

commit b0834539e66f269880c3ba78ea666087bf244406
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 12 14:28:53 2009 +0200

    s3-docs: remove xml artefact from net.8.xml.
    
    Guenther
    (cherry picked from commit 5eb14b2994b4508156c0760cc4adf4db70eee9cc)
    (cherry picked from commit 68ffe06565746c6172f68888052ce6809036dd27)

commit ef67cf62d67fbc24e182fad1434d075040150d12
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date:   Tue Oct 13 14:13:06 2009 +0200

    s3/loadparm: Fix severe HPUX compiler issue.
    
    Members of struct should be initialized explictly.
    Fixes bug #6804.
    (cherry picked from commit 5ec557d9f6137dc96b2c099fb13726e6552fb1fe)
    (cherry picked from commit 4c7d2aa2da9935248ee772d574f5225bbb9afd5d)

commit b5493f8ced67e04ee173aed6eb2b40e1e5ef2291
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Oct 12 16:11:53 2009 +1100

    torture: fixed socket leak in BENCH-TCON test
    
    The BENCH-TCON test was leaving the socket open. A smbclie_tdis()
    closes the tree connection, but does not close the socket.
    
    This caused the build farm to run out of file descriptors
    (cherry picked from commit f1529c3223a4b366cd4795c559eaaa8c40078470)

commit 8c1ec1996afbc595a9bb1fe55380f4a9086bd244
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Oct 12 22:37:34 2009 +0200

    Ñ•3: fix domain trust documentation confusion
    
    fix some trusted/trusting mixups, make documentation more precise
    and man page more verbose.
    (cherry picked from commit b7dfa5abfd4897f983824f620e0919ad14fcf06a)

commit 1974cfcdc41ad915f37212971469f6202ce7136a
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Oct 12 13:01:48 2009 +0200

    WHATSNEW: Update changes.
    
    Karolin
    (cherry picked from commit 1e2673557ed4738545c47094b375dbccf616476c)

commit 49bc39c115bfa1eb99dc21418912242a044470fa
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Oct 12 12:52:29 2009 +0200

    s3/proto.h: Add lp_ldap_ref_follow prototype.
    
    Fix build of smbldap.
    
    Karolin
    (cherry picked from commit 8def289c8e19fc516ddcf67a117a8e8250baf1c2)
    (cherry picked from commit 142faf7d4efca3f7d8f4588b943e28583db8964f)

commit d3871d27aa85509a8a050e652ee95f03d6799850
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Mon Oct 12 11:34:58 2009 +0200

    s3/smbldap: add option to disable following LDAP refs
    
    Fix bug #6717.
    (cherry picked from commit c5d5969e24913ea544590dd16378f7e071b07c4b)
    (cherry picked from commit a50372629107d98d933bc7851c7973076b3674fe)

commit 18989d6bac6db6c062c6d6f7398f48ec24ef8fad
Author: Simo Sorce <idra at samba.org>
Date:   Sun Oct 11 09:42:59 2009 -0400

    Fix builds with external tdb
    
    Make sure we do not reference our internal tdb directly.
    Let configure define what tdb.h file to use so that builds that use an
    extrenal tdb do not include 2 different versions of the tdb header.
    (cherry picked from commit dce488bc35af7ec137b657448708914edf5df706)

commit a3727668f0264d381af838a312f5852f6ed09351
Author: Matt Kraai <mkraai at beckman.com>
Date:   Thu Sep 17 07:07:42 2009 -0700

    Use the method used by build_env.sh to discover the user name.
    
    so try USERNAME, then LOGNAME, then whoami, then id -un to find out who we
    are.
    (cherry picked from commit 2f9576801d1e14b5489cef93c677114d18ef3d83)

commit 5907988b50a7870b7c03a49c340ab1a8cbd9ed53
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Oct 9 22:58:14 2009 +0200

    s3: Fix a memleak reported by dmarkey
    (cherry picked from commit 1f1c293d541fc2ab6dff5932ae1c9ffc1e8b58d3)

commit 7b4995535e0621e8026781652cbfea00cba2ee59
Author: Simo Sorce <idra at samba.org>
Date:   Fri Oct 9 13:14:08 2009 -0400

    Fix builds with external talloc
    
    Make sure we do not reference our internal talloc directly.
    Let configure define what talloc.h file to use so that builds that use an
    extrenal talloc do not include 2 different versions of the talloc header.
    (cherry picked from commit 030fbf28fc963065853c08015c34827656c29bfd)

commit 1b61f109f906ee694221a64a3495f639747f3f08
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Oct 9 09:22:02 2009 +0200

    WHATSNEW: Update WHATSNEW.
    
    Karolin
    (cherry picked from commit b638a210f8deacb5cbd56ce273e7efd9bb052054)

commit 8a97b47971e5447ac98d4267d9b4982234c1c66d
Author: Steven Danneman <steven.danneman at isilon.com>
Date:   Fri Oct 2 17:02:20 2009 -0700

    s4/torture: Add server target of OneFS
    
    I've added a "--target=onefs" which lists expected deviation in the
    OneFS SMB server implementation compared to a Windows machine.
    
    I've added this in a generic way using a list of module specific
    parameters.  This list currently only contains the absence of
    SACL support but will be added to as additional server differences
    are defined.
    
    I'd liked to use this abstraction for defining the differences between
    a WinXP and Win7 server as well.
    (cherry picked from commit 0dc5d0bb359705c8a4b9d984c862f22d9215e70f)

commit d2ff8093d0dcdac4d7c0358719ac2682a47c812e
Author: Aravind Srinivasan <aravind.srinivasan at isilon.com>
Date:   Tue Oct 6 16:57:34 2009 -0700

    s4/torture: Add SMB sharemode/access mask tests
    
    Test several thousand permutations of create mask and sharemodes on file
    and directory opens.
    
    These tests use a checked-in results table derived from a WinXP server to
    verify correct server behavior.
    
    CREATEX_ACCESS
    CREATEX_SHAREMODES_FILE
    CREATEX_SHAREMODES_DIR
    MAXIMUM_ALLOWED
    (cherry picked from commit c2a321299f7803a1d992e4149816a39ff607e5c2)

commit 1b463efd320214bc0210e8246e2f7dd047a36c06
Author: Aravind Srinivasan <aravind.srinivasan at isilon.com>
Date:   Tue Oct 6 16:43:43 2009 -0700

    s4/torture: change comments to torture_failures
    
    This allows the frameworks that wrap smbtorture to detect errors
    better.
    (cherry picked from commit 8ca31430de94abc40a72eb1208478b6ecc56145e)

commit 893e1867613071691d492756bd25a94bccc75923
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 8 10:35:02 2009 +0200

    s3-winbindd: NDR_WBINT_CHECKMACHINEACCOUNT should not be cacheable.
    
    Guenther
    (cherry picked from commit efaa98e82438688ca178dc7d0622965933abc95c)
    (cherry picked from commit 4e64865f522506b5b92b7ce0f05bac7ca7de6de3)

commit 84015a481e87921df709025706a4d21008f3a3d7
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 6 17:46:25 2009 +0200

    s3-winbindd: libwbclient: implement secure channel verification for specific domains in wbcCheckTrustCredentials().
    
    Guenther
    (cherry picked from commit 3c3725a340ffe20ab679cf2f9d41ccd0b51b4b3a)
    (cherry picked from commit 8716c4ae193a49ea8494e04296f6d95126c0e265)

commit 701ace11bea4f0d63efb95d77f881f354d87d68e
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 7 10:43:53 2009 +0200

    wbinfo: allow to check trusts via "wbinfo -t --domain DOMAINNAME".
    
    Guenther
    (cherry picked from commit 7b3501200c55d7844c4d697456dbfa2b86cfdcc8)
    (cherry picked from commit 69ba747df1b861da70da6682e36b095ac565f83e)

commit 824142cb957a62242dcf66ec9ce13edd6fd50bad
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 6 17:45:24 2009 +0200

    libwbclient: implement secure channel verification for specific domains in wbcCheckTrustCredentials().
    
    Guenther
    (cherry picked from commit 2df47b0a54ad0a973b81911ee507ab50555b24a6)
    (cherry picked from commit 63acae34cfe65577437b75e668d22400eb47a88c)

commit d41cebc42862a660a72e750b27961745440470cc
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 6 17:50:15 2009 +0200

    s3-netlogon: pure cosmetic indent fixes in _netr_LogonControl2Ex().
    
    Guenther
    (cherry picked from commit 3d3134a7d6a4d49b891a446f6cc7b38fd953739a)
    (cherry picked from commit 5ba5b5e7a1a66472505b3a3fb3d83db5180da3ee)

commit 1bcf3cc55c58ed9cb06d80b1b568aba7c01f048e
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 9 00:21:34 2009 +0200

    s3: make linking of libwbclient --as-needed safe
    
    Partly fixes #6791. Thanks to Buchan Milne!
    (cherry picked from commit abdadc23e3bb196b37327920bcdc79a137c2e9db)

commit 73792e1d3b2006f3bf2910f668033e15cef94150
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Oct 4 01:40:34 2009 +0200

    s3:Makefile: another attempt to fix the wbclient dependency
    
    in the dependencies we always used a variable that was not jet defined.
    (cherry picked from commit ad21e5e9076e9621b19d9fae50ae9b44e85c6628)

commit c371903d86a77d399fb3dcda043edfe5dc26ad23
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Oct 4 01:33:12 2009 +0200

    s3:Makefile: another attempt to fix the netapi dependency
    
    in the dependencies we always used a variable that was not jet defined.
    (cherry picked from commit 3a1a181d7f2925cc9e8f867d126616a6f466a2dc)

commit d5f0af2ca0d49fd7ef5062d069848a290a95d023
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Oct 4 01:30:43 2009 +0200

    s3:Makefile: another attempt to fix the tdb dependency
    
    in the dependencies we always used a variable that was not jet defined.
    (cherry picked from commit 4adb0ac3d8f60c3b421bfce7e5946b087b55e0d9)

commit bb68ba0bd356f35de1faee9e132255998aac5112
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Oct 4 01:20:38 2009 +0200

    s3:Makefile: another attempt to fix the talloc dependency
    
    in the dependencies we always used a variable that was not jet defined.
    (cherry picked from commit 33385434119f178e46c9f6496b8c2a2d4062bb05)

commit 5a2e600834c614e71c8268663fc42b3a9d9be219
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Oct 3 23:04:12 2009 +0200

    Revert "s3:Makefile: fix talloc dependencies with static build (2nd try)"
    
    This reverts commit b60d87c20712bd3d83166bd13fe1d2bab0315609.
    (cherry picked from commit f2257d821e380f5adba5094b1d30c12df10cb72c)

commit c7defdbad9f721ad29ea2cde270583b035bdde31
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Oct 3 23:00:37 2009 +0200

    Revert "s3:Makefile: fix libtdb dependencies with static build"
    
    This reverts commit da15726630b0f796aef52a20d96898e269058456.
    (cherry picked from commit c9ee01ba19b955b2f7389a37e275ac54117f0bba)

commit 4c97cd46f261f5c676363301f2b87c787f5548c9
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Oct 3 22:53:52 2009 +0200

    Revert "s3:Makefile: fix libwbclient dependencies with static build"
    
    This reverts commit d7795f2afa3779399fe9e7b4f050d19a412f8bcd.
    (cherry picked from commit 7074dc9b688aa66c50f4fe7949af85d1a7eb1432)

commit 3be986cb09fba7ea65498c5830c8d02f1388d609
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Oct 3 22:53:15 2009 +0200

    Revert "s3:Makefile: fix libnetapi dependencies with static build"
    
    This reverts commit 110897a057af01f3c01a1783e06080b54631ba2d.
    (cherry picked from commit 7928c737598cc407417a32d2fe6d95c0d8da97d0)

commit 1dd1c7d4cf35632417d3b3035589002bd5130f81
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Oct 8 15:36:36 2009 -0700

    Cope with old CIFSFS clients that use SMBunlink to remove
    symlinks instead of trans2:posix_unlink.
    Jeremy.
    (cherry picked from commit 59676ec21f022a2af2f72385d8ea368f2a60ad3b)

commit 2250735a07a39c5af9b1cf5e4e17df2bbdb04c75
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Oct 8 14:02:39 2009 +0200

    s3: Fix shadow copy display on Windows 7
    
    Windows 7 is a bit more picky on our NT_STATUS_BUFFER_TOO_SMALL. Announce the
    right buffer size, the same amount we later check for.
    (cherry picked from commit c6c0907950030db90331e5e0ac96a68619fe4a73)

commit 1dea2f34cbb09fcb512d129f5a58a25e3449e5c4
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 7 16:52:29 2009 -0700

    Exteded RAW-RENAME test to catch regressions in bug 6781.
    Jeremy.
    (cherry picked from commit d294fd3a0c152e5bde491d39219c54c113db9afe)

commit bdda07d35454fa7d97da77394ece821683d43ec9
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 7 15:43:43 2009 -0700

    Oops. Don't break the build..
    Jeremy.
    (cherry picked from commit 879c3b8888b9a77136777b269ad730d4b3ca223b)

commit 54146673cc179370a5ef8eb48d87a48225416620
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 7 15:39:38 2009 -0700

    Make the logic a lot clearer and fix the comment to match.
    Jeremy
    (cherry picked from commit 48fee26ab0a7b33fa97032b85bebbb4dc7fb8c68)

commit 2165f198d63ffedb4c454d67006df701e5b6bad8
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 7 15:14:50 2009 -0700

    Correct fix for bug 6781 - Cannot rename subfolders in Explorer view with recent versions of Samba.
    Without this fix, renaming a directory ./a to ./b, whilst a directory ./aa was already open
    would fail.
    Jeremy.
    (cherry picked from commit fcd6a57d310a55cda7ff6248a59a99d50d925bed)

commit 02d9be8fb402ea7650330446ba96c3d6f9cae12a
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 6 17:18:15 2009 -0700

    Test creating and deleting a bad symlink using the POSIX calls. Ensure
    we don't regress on bug 6769.
    Jeremy.
    (cherry picked from commit 22d26287cf3f89c9294c285aff12736c47b85896)

commit 46625071391701d4155c4ef06da7d02ae86fa7f9
Author: Abhidnya P Chirmule <achirmul at in.ibm.com>
Date:   Tue Oct 6 17:14:56 2009 +0200

    s3: Add access_mask to the flock VFS call
    (cherry picked from commit 763c95c145b6313a1460a7e45685a7f966e8bd4d)

commit 766877b8028d34c58af06d5018da6b4e99fa9d40
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 5 17:05:38 2009 +0200

    s3-winbindd: make sure to reset connections when machine account password change chain was broken.
    
    Guenther
    (cherry picked from commit c344bf0184be484fff8bb5ed93b5c2ca6de58611)
    (cherry picked from commit 2a9accd85e992798ee36cb1ea74ed06f5379be3d)

commit da2f032292d31b72ea44cf333d384928a0a4009a
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 5 17:04:52 2009 +0200

    s3-netlogon: setup NETLOGON credential chain in rpccli_netlogon_set_trust_password() only when needed.
    
    Guenther
    (cherry picked from commit 0c2fc9eedf241746067d1625f643c894bfa11394)
    (cherry picked from commit d76c914adc17e4374c9e21b6733514fd7ad9bdac)

commit 1673a8a045f511850c453f089a66b6f160497284
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Oct 5 10:27:48 2009 -0700

    Fix bug 6776 - Running overlapping Byte Lock test will core dump Samba daemon.
    Re-write core of POSIX locking logic.
    Jeremy.
    (cherry picked from commit 2fa98946d9eb3d0b6973dfaeadc55c8112ec30e1)

commit 8e5680d44d159f6f449a2369d0265675c969af8c
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 5 13:01:53 2009 +0200

    s3-net: print error when "net rpc changetrustpw" has failed.
    
    Guenther
    (cherry picked from commit 55b12d032c82b280bc0fda43bff8e5b05b934ecf)
    (cherry picked from commit cb6559062909f365b32cd8e3986269e38701c78c)

commit f9ca74539ef821200e33c919921f588fbe9fd9cb
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 4 15:19:19 2009 +0200

    s3: Remove a scary error message -- talloc_move can not fail :-)
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit 84de81b4786bed411199f2785a1eafc7c86db478)
    (cherry picked from commit fb0b85b59c4a7db846d66d6db816c2c4dee1b887)

commit 07ea1fe13fe43234edf9d7d765469400b07cc6fb
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 4 15:13:44 2009 +0200

    s3: Fix nonempty blank lines
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit d696f9a7ed0bb42c6d9de99ab07af27b00fe2d40)
    (cherry picked from commit b5117b18fdcbbc64e583264085f08c76b587c43b)

commit d548e549b09e30a42d0b56a115850cda0f5007e2
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 2 01:25:13 2009 +0200

    lib/tdr: get rid of build warning when using TDR_ALLOC macro.
    
    Guenther
    (cherry picked from commit ab8a16c77f8222115493bbc295318a7d9ceb6d38)
    (cherry picked from commit 804be72c085b3add97043149c78b767820d182f5)

commit 004fb5b30363334eba81e2d77de4adb52205d469
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 1 13:42:29 2009 +0200

    s3: remove unused PRS_POINTER_CAST macro.
    
    Guenther
    (cherry picked from commit 926457ec9565c980c14a658b34291e41317d404b)
    (cherry picked from commit 805d851a7d45fbcd74f9a85a8c33d111fd53e763)

commit 16a240749c325e68d0bbf5bdae571053b0d54867
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 1 12:52:46 2009 +0200

    s3: remove unused SYSTEMTIME struct.
    
    Guenther
    (cherry picked from commit 2497f70257bd7b5523c65d342e68d8a1c85c41c2)
    (cherry picked from commit a272430e74f390c35ee525156753346115f7895f)

commit 8edfd1e4f4b9e32c4a2ccdf9e046355134c1342f
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Oct 3 00:19:30 2009 +0200

    s3:Makefile: minor clean up
    (cherry picked from commit a86f80beefb11fdebc00b0442d7735d6e1081995)

commit 54372a1cb7bb00f4662825bc81a6baa335cf0274
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Oct 3 00:15:19 2009 +0200

    s3:Makefile: fix libnetapi dependencies with static build
    
    analogical to previous libtalloc fix
    (cherry picked from commit fdd52658643ca27b07302eba423d22c12c6df8fd)

commit 755a3e94290bced04d17e21a92af01b10ff24cee
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 2 23:08:11 2009 +0200

    s3:Makefile: eventlogadm dependency cleanup
    
    no need to link against popt lib
    (cherry picked from commit 2fbb07239af249a3adc0435248c4a8702e35f8a1)

commit 2a452b3e6d73e695f857a613658d584286a7b304
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 2 23:05:27 2009 +0200

    s3:Makefile: fix libwbclient dependencies with static build
    
    analogical to previous libtalloc fix
    (cherry picked from commit 0d4a5b63f0c96df6db46032f4280a707273438de)

commit 6a013e7aac407f57412bd973b2611070a234b2f0
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 2 23:01:18 2009 +0200

    s3:Makefile: fix libtdb dependencies with static build
    
    analogical to previous libtalloc fix
    (cherry picked from commit d0dca4a3075e87f10a557167d680781b85af237d)

commit 29524efc0570479d148d456c7ba0a472517c5211
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 2 22:43:14 2009 +0200

    s3:Makefile: fix talloc dependencies with static build (2nd try)
    
    When configure options --with-libtalloc=no --enable-shared-libs=no are used,
    LIBTALLOC_TARGET stays empty. Actually LIBTALLOC_TARGET which is only used for
    Makefile dependencies is obsolete as LIBTALLOC contains exactly the targets
    that we depend on, libtalloc finally is the target to depend on.
    (cherry picked from commit f60f3c9dec1dd413399755b0d5cb0dda3d0a5467)

commit 8c977d0b41a89879b3cc0bb7589e767e9e48971e
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 2 22:00:50 2009 +0200

    Revert "s3:Makefile: fix talloc dependencies with static build"
    
    This reverts commit 2af2334522bc3d2c44bdcf7c9f1e80d2bcbf2024.
    
    a more correct way to fix the libtalloc dependencies follows
    (cherry picked from commit c87c5fa7c9c3405c2c717697ae14056bc9450988)

commit 17c8fba9a1e573298934ff8eadd94689f62b0b82
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 2 02:18:50 2009 +0200

    s3:Makefile: libsmbsharemode dependency cleanup
    
    no need to link against ldap and krb5 libs
    (cherry picked from commit 9bcb2f1ad1665673cece0450ca9937898e17585a)

commit c603ca310d1cb52558acca7480d7b4ed0c7444ff
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 2 02:28:56 2009 +0200

    s3:Makefile: net utility dependency cleanup
    
    no need to link against iniparser lib
    (cherry picked from commit 4e344314fdffe6211f5056451f38d218a2dafb85)

commit 00dcdd97a81f2721c8ac19381de01aecd2aa2a88
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 2 19:53:53 2009 +0200

    s3:configure: use --aѕ-needed linker option when supported
    
    Based on a patch from Andreas Schneider but modified that --aѕ-needed is also
    used when own libs are not build shared (--enable-shared). Also change order of
    options so that user supplied LDFLAGS are put *after* the automatic --aѕ-needed
    flag. This way it's pollible to force not use as-needed by setting LDFLAGS
    environment variable to "-Wl,--no-as-needed".
    (cherry picked from commit aaced534fb00445e4efa70392b6c0b22ab59b3cc)

commit 395f247a79aabf2dcfafa7646876aeab7de4b746
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Oct 2 17:55:50 2009 +0200

    s3:doc: add some detail about lanman auth parameter
    
    add interesting detail: lm passwords will be removed from databaѕe with
    lanman auth = no
    (cherry picked from commit 06aba9680f84364da10489d174105ef4c4796450)

commit 95922c6b6e0f814d7e651e56f703ee9f7420aa82
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 2 13:45:38 2009 -0700

    Remove lots of duplicate code and move it into one
    function vfs_stat_fsp(). Stops code looking at fsp->posix_open
    except for exceptional circumstances.
    Jeremy.
    (cherry picked from commit da45a3ca779d3441265837167b021ea4920edb01)

commit be490c9f9a93e0946722fc1fb311f53589d5d177
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 2 11:07:17 2009 -0700

    Missed one VFS_STAT -> VFS_LSTAT
    Jeremy.
    (cherry picked from commit 00738a2c92ab9e8d35976b49f1809e88f77d1e9d)

commit 811660e46c6891be158368f0e254a83bd148b93e
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 2 11:05:03 2009 -0700

    Fix more use of VFS_STAT when posix pathnames selected.
    Jeremy.
    (cherry picked from commit 8b5fddf729d73fa2c0e4496fa5aa0d1093c70a05)

commit 7f6e4312c5fa2c338102fdbac049db12472272d6
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 30 16:18:29 2009 +0200

    s3: re-run make idl. janitor for tridge.
    
    Guenther
    (cherry picked from commit a6567cf198f9d1c9df0f34c463cec3b9f0aa2e54)
    (cherry picked from commit f1470f7e46e2a33b40b9660f2c46996174d8c849)

commit 5a12fa48f15b6dde0c8d3dbd6e925865613b1195
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date:   Thu Sep 17 13:52:28 2009 +0300

    w32err: WERR_DOMAIN_CONTROLLER_NOT_FOUND error value fixed
    
    Signed-off-by: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
    (cherry picked from commit e66911390005f377196d49dffb06cd4ae25ddc5f)
    (cherry picked from commit 577504dd70cc76151dc4c4259a88229e5999b6e3)

commit cc042de185557601d111a643994e1368f8fd4378
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date:   Thu Sep 17 23:18:40 2009 +0300

    w32err: FRS_ group of errors replaced with numeric values
    
    Signed-off-by: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
    (cherry picked from commit 0e64fcb18f22f31b9004e43f701ea109cef6075d)
    (cherry picked from commit 11c2052c6f1c452ce51f1859e3bbd9690bfcb36f)

commit 999789e42ad07e3b545fa83a4903586a0b6b343f
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date:   Fri Sep 18 00:46:52 2009 +0300

    w32err: WERR_DC_NOT_FOUND replaced with WERR_DCNOTFOUND
    
    It turns out in win32 ERROR_DC_NOT_FOUND exists and it is
    an error for Device Context (DC), not Domain Controller
    
    Signed-off-by: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
    (cherry picked from commit d9994a604bd51949a9869927bdc2cb512fba9171)
    (cherry picked from commit e9cb12953f191489b34e84547fc84841ff29515a)

commit 90d2d422b46cec1bcce6633ec7eed49d2aceadb0
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date:   Fri Sep 18 00:00:21 2009 +0300

    w32err: WERR_USER_EXISTS replace with WERR_USEREXISTS name
    
    In Win32 we have
    NERR_UserExists which maps to WERR_USER_EXISTS currently
    and there is
    ERROR_USER_EXISTS which maps to WERR_USER_ALREADY_EXISTS
    
    Signed-off-by: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
    (cherry picked from commit 948cd70bad6600a4e4e1493469efc0ccd9399c18)
    (cherry picked from commit f5586f6f14e40579b6c8f3da0daa5a8dd78aa956)

commit 08e51f2dea24163834435bc88479695df961b4ee
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date:   Fri Sep 18 00:20:23 2009 +0300

    w32err: WERR_GROUP_NOT_FOUND renamed to WERR_GROUPNOTFOUND
    
    In Win 32 we have
    NERR_GroupNotFound which maps to WERR_GROUP_NOT_FOUND currently
    and we have
    ERROR_GROUP_NOT_FOUND which maps to nothing, so it is to be added
    
    Signed-off-by: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
    (cherry picked from commit 0e1840b84a892d31cbc45191b2965db5c931670b)
    (cherry picked from commit 6064f524738309b1062da4e8605145f920b7c856)

commit 7582f0ce33efe08c77c8bb12d796674e47e48e80
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date:   Fri Sep 18 16:30:09 2009 +0300

    w32err: Importing auto-generated Win32 errors and descriptions
    
    Error codes and their descriptions are generated
    using w32err_code.py script.
    Error are downloaded from MS site:
    http://msdn.microsoft.com/en-us/library/cc231199%28PROT.10%29.aspx
    
    Signed-off-by: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
    (cherry picked from commit 1f2490e7d8b5a64caf75143041ce07bd2968839e)
    (cherry picked from commit 248b7b5f74d8615c8b582df1f72fc71320bffb44)

commit 16a4af6131f1db5e0661693e8fb6f45f9c34828d
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 30 15:22:02 2009 +0200

    s3-printing: use regval_ctr_addvalue_multi_sz.
    
    Guenther
    (cherry picked from commit bbf394f36dbf2516ba92035791ebb67380de8d6e)
    (cherry picked from commit 3d98546ebf8c582cdd675e7e93693f54968fbc58)

commit f0a18dabcba7f791ae06a49d2ff5df8a6387c732
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 30 15:21:37 2009 +0200

    s3-registry: add regval_ctr_addvalue_multi_sz.
    
    Guenther
    (cherry picked from commit 05e8e90976e86689425ccafc9ecfc1d99c53a3db)
    (cherry picked from commit 1febace29881995901eb5694f22ee333e7166fd7)

commit a5e6e6b28bcb1eae2c5590f51530aeedc4d2afe7
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 30 01:23:13 2009 +0200

    s3-rpc_parse: remove unused prs_string.
    
    Guenther
    (cherry picked from commit afdea18fcf66ab9a03b542ea7f3d23d01a0a1931)
    (cherry picked from commit 4567a2ef52b0d04748337dc76315be277e72899a)

commit 9dc2b76b46c1ca1cc9876f5aad1731f248059002
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Oct 1 16:54:06 2009 -0700

    Fix bug #6769 - symlink unlink does nothing.
    Always use LSTAT for POSIX pathnames.
    Jeremy.
    (cherry picked from commit 4a7016200731ea3e133665568027a3c99e1fcf71)

commit 93b27ca610fa96e83b6db569a638c226ef0cb5cd
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Oct 1 16:18:33 2009 -0700

    NULL is not a valid event context.
    Jeremy.
    (cherry picked from commit 2820dc529a04985b7223603e826f6b9905d2611b)

commit 2325e172cef7961d332f2c316aa069dec6c37b91
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Oct 1 18:57:38 2009 +0200

    s3:Makefile: fix talloc dependencies with static build
    
    When configure options --with-libtalloc=no --enable-shared-libs=no are used,
    LIBTALLOC_TARGET stays empty. Actually LIBTALLOC_TARGET which is only used for
    Makefile dependencies is obsolete as LIBTALLOC contains exactly the targets
    that make the dependencies are. Obnox, pleaѕe check!
    (cherry picked from commit 7e3792f91b9ce9ac08f99f95eaa5ab0ab7c8277d)

commit 7e26d6c01eeda8d4d5658e85549c1581256dc385
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Oct 1 19:08:51 2009 +0200

    s3:configure: don't throw away PRINT_LIBS
    
    PRINT_LIBS might have been set before intentionally, so don't thow it away.
    (cherry picked from commit 432c6203c78ad0be482b85be0b583105c8378b62)

commit 215de162a4f4caca6a6f30899364a962493db829
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Sep 23 14:40:25 2009 +0200

    s3: update comment about (deprecated) a6 records
    (cherry picked from commit bc78a5bae3ffa1c74847adb91230afa4ea031240)

commit 8bdd24447fbcbbc8c00a699869009a2227ed8b8d
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 1 10:21:17 2009 +0200

    s3-perfcount: more cleanup.
    
    Guenther
    (cherry picked from commit 7a98fdebe454ec55e93868ca319615bf442b2ff8)

commit 33d5fdc64596795cb09d656f8d97c67f01c2295f
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 1 03:39:07 2009 +0200

    s3-perfcount: only pass down prs_struct when really required.
    
    Guenther
    (cherry picked from commit f1b5d5dcab5d8249ae8dc6d26cf9e9e163b95a8d)

commit f06e021acffd8fb6caeaf2e4ab7d0ea919dbe85a
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 1 02:09:33 2009 +0200

    s3: add perfcount idl and generated files.
    
    Guenther
    (cherry picked from commit 11f56f48433951046a79683eda08ab8a4246d487)

commit 8c3ae5f757499ce9bfb1032eb8b267345e8a04dc
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 1 01:30:45 2009 +0200

    s3-registry: move rpccli_winreg_Connect to the only file it belongs.
    
    Guenther
    (cherry picked from commit ca90b480da3f5d813186d3b7be22a5a0ae1057f6)

commit 188be655110b90f93f8180ef04589bf6016d522c
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 30 20:01:54 2009 +0200

    s3: remove unused rpcstr_pull and rpcstr_pull_talloc.
    
    Guenther
    (cherry picked from commit 1a0db7a957682782bd915526c69c0779e7b8335f)

commit de62c316ddefb494046fd2a69a8b7bcb70f2a0bf
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 30 20:01:35 2009 +0200

    s3-printing: more use of pull_reg_sz().
    
    Guenther
    (cherry picked from commit d2fd44b357f1e4aa11391b6c9f2602d90eb6d6ec)

commit f260ce3491a720f2893c355d6ce64f28665bc9af
Author: Günther Deschner <gd at samba.org>
Date:   Wed Sep 30 20:00:52 2009 +0200

    s3-registry: use pull_reg_sz() where appropriate.
    
    (and move away from rpcstr_pull and rpcstr_pull_talloc).
    
    Guenther
    (cherry picked from commit 62a7ea41ec40dd23ea4e70d2c3c507b37978c4f0)

commit 9bb2d7c08c591f4c0f3563181cf552db2ca3169d
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Oct 1 10:23:29 2009 -0700

    Fix for CVE-2009-2813.
    
    ===========================================================
    == Subject:     Misconfigured /etc/passwd file may share folders unexpectedly
    ==
    == CVE ID#:     CVE-2009-2813
    ==
    == Versions:    All versions of Samba later than 3.0.11
    ==
    == Summary:     If a user in /etc/passwd is misconfigured to have
    ==              an empty home directory then connecting to the home
    ==              share of this user will use the root of the filesystem
    ==              as the home directory.
    ===========================================================
    (cherry picked from commit 87b31c0266360f311ae6207b9ec5bce9d8e01be7)

commit 1d52cf3d787c55fdf3934b0e85810b24af52ad77
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Oct 1 14:53:55 2009 +0200

    s3/docs: Set correct version number for manpages.
    
    Karolin
    (cherry picked from commit 2d4ffe2a8cb7e0db9733a0e58b1c34e82fd40faf)

commit 93b43e99dfc608467447ef9cec33d5c0d1628786
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Oct 1 14:32:36 2009 +0200

    Fix for CVE-2009-2906.
    
    Summary:
    Specially crafted SMB requests on
    authenticated SMB connections can send smbd
    into a 100% CPU loop, causing a DoS on the
    Samba server.
    (cherry picked from commit 8a6b90d401e3c8d4d04ade36020bfc5c31c9603e)
    (cherry picked from commit 0b3d471a289ef79a41704c0a0c8bdc479ac3d7f0)

commit 5ae89bd4aa5bd1d3c8a6970c9fce0ce4a6c833ae
Author: Jeff Layton <jlayton at redhat.com>
Date:   Fri Sep 25 07:07:40 2009 -0400

    mount.cifs: don't leak passwords with verbose option
    
    When running mount.cifs with the --verbose option, it'll print out the
    option string that it passes to the kernel...including the mount
    password if there is one. Print a placeholder string instead to help
    ensure that this info can't be used for nefarious purposes.
    
    Also, the --verbose option printed the option string before it was
    completely assembled anyway. This patch should also make sure that
    the complete option string is printed out.
    
    Finally, strndup passwords passed in on the command line to ensure that
    they aren't shown by --verbose as well. Passwords used this way can
    never be truly kept private from other users on the machine of course,
    but it's simple enough to do it this way for completeness sake.
    
    Reported-by: Ronald Volgers <r.c.volgers at student.utwente.nl>
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Acked-by: Steve French <sfrench at us.ibm.com>
    (cherry picked from commit 54de6ac85eb81aecc8b44a500f374edb95bf6a3d)

commit 64c649378e08f5749c66033324377ae024405eb9
Author: Jeff Layton <jlayton at redhat.com>
Date:   Fri Sep 25 06:45:10 2009 -0400

    mount.cifs: check access of credential files before opening
    
    It's possible for an unprivileged user to pass a setuid mount.cifs a
    credential or password file to which he does not have access. This can cause
    mount.cifs to open the file on his behalf and possibly leak the info in the
    first few lines of the file.
    
    Check the access permissions of the file before opening it.
    
    Reported-by: Ronald Volgers <r.c.volgers at student.utwente.nl>
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Acked-by: Steve French <sfrench at us.ibm.com>
    (cherry picked from commit 0293057abd8cdfc7c690cf5c8dd20b8a626d52ca)

commit f92dd73d52e0e9e63393088ef81b1397dcf4c985
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date:   Wed Sep 30 15:20:09 2009 -0700

    allow for outstanding_aio_calls to be decremented
    (cherry picked from commit 5b0b93991f256d1cd5c681c60075c4b17a0bc3c9)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                         |    2 -
 README.Coding                                      |   14 +-
 WHATSNEW.txt                                       |  121 +-
 client/cifs.upcall.c                               |   38 +-
 client/mount.cifs.c                                |   57 +-
 docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml     |    2 +-
 docs-xml/manpages-3/cifs.upcall.8.xml              |    2 +-
 docs-xml/manpages-3/eventlogadm.8.xml              |    2 +-
 docs-xml/manpages-3/findsmb.1.xml                  |    2 +-
 docs-xml/manpages-3/idmap_ad.8.xml                 |    2 +-
 docs-xml/manpages-3/idmap_adex.8.xml               |    2 +-
 docs-xml/manpages-3/idmap_hash.8.xml               |    2 +-
 docs-xml/manpages-3/idmap_ldap.8.xml               |    2 +-
 docs-xml/manpages-3/idmap_nss.8.xml                |    2 +-
 docs-xml/manpages-3/idmap_rid.8.xml                |    2 +-
 docs-xml/manpages-3/idmap_tdb.8.xml                |    2 +-
 docs-xml/manpages-3/idmap_tdb2.8.xml               |    2 +-
 docs-xml/manpages-3/ldb.3.xml                      |    2 +-
 docs-xml/manpages-3/ldbadd.1.xml                   |    2 +-
 docs-xml/manpages-3/ldbdel.1.xml                   |    2 +-
 docs-xml/manpages-3/ldbedit.1.xml                  |    2 +-
 docs-xml/manpages-3/ldbmodify.1.xml                |    2 +-
 docs-xml/manpages-3/ldbrename.1.xml                |    3 +
 docs-xml/manpages-3/ldbsearch.1.xml                |    2 +-
 docs-xml/manpages-3/libsmbclient.7.xml             |    2 +-
 docs-xml/manpages-3/lmhosts.5.xml                  |    2 +-
 docs-xml/manpages-3/log2pcap.1.xml                 |    2 +-
 docs-xml/manpages-3/mount.cifs.8.xml               |    2 +-
 docs-xml/manpages-3/net.8.xml                      |   16 +-
 docs-xml/manpages-3/nmbd.8.xml                     |    2 +-
 docs-xml/manpages-3/nmblookup.1.xml                |    2 +-
 docs-xml/manpages-3/ntlm_auth.1.xml                |    2 +-
 docs-xml/manpages-3/pam_winbind.8.xml              |    2 +-
 docs-xml/manpages-3/pdbedit.8.xml                  |   12 +-
 docs-xml/manpages-3/profiles.1.xml                 |    2 +-
 docs-xml/manpages-3/rpcclient.1.xml                |    2 +-
 docs-xml/manpages-3/samba.7.xml                    |    2 +-
 docs-xml/manpages-3/sharesec.1.xml                 |    2 +-
 docs-xml/manpages-3/smb.conf.5.xml                 |    2 +-
 docs-xml/manpages-3/smbcacls.1.xml                 |    2 +-
 docs-xml/manpages-3/smbclient.1.xml                |    2 +-
 docs-xml/manpages-3/smbcontrol.1.xml               |    2 +-
 docs-xml/manpages-3/smbcquotas.1.xml               |    2 +-
 docs-xml/manpages-3/smbd.8.xml                     |    2 +-
 docs-xml/manpages-3/smbget.1.xml                   |    2 +-
 docs-xml/manpages-3/smbgetrc.5.xml                 |    2 +-
 docs-xml/manpages-3/smbpasswd.5.xml                |    2 +-
 docs-xml/manpages-3/smbpasswd.8.xml                |    2 +-
 docs-xml/manpages-3/smbspool.8.xml                 |    2 +-
 docs-xml/manpages-3/smbstatus.1.xml                |    2 +-
 docs-xml/manpages-3/smbtar.1.xml                   |    2 +-
 docs-xml/manpages-3/smbtree.1.xml                  |    2 +-
 docs-xml/manpages-3/swat.8.xml                     |    2 +-
 docs-xml/manpages-3/tdbbackup.8.xml                |    2 +-
 docs-xml/manpages-3/tdbdump.8.xml                  |    2 +-
 docs-xml/manpages-3/tdbtool.8.xml                  |    2 +-
 docs-xml/manpages-3/testparm.1.xml                 |    2 +-
 docs-xml/manpages-3/umount.cifs.8.xml              |    2 +-
 docs-xml/manpages-3/vfs_acl_tdb.8.xml              |    2 +-
 docs-xml/manpages-3/vfs_acl_xattr.8.xml            |    2 +-
 docs-xml/manpages-3/vfs_audit.8.xml                |    2 +-
 docs-xml/manpages-3/vfs_cacheprime.8.xml           |    2 +-
 docs-xml/manpages-3/vfs_cap.8.xml                  |    2 +-
 docs-xml/manpages-3/vfs_catia.8.xml                |    2 +-
 docs-xml/manpages-3/vfs_commit.8.xml               |    2 +-
 docs-xml/manpages-3/vfs_default_quota.8.xml        |    2 +-
 docs-xml/manpages-3/vfs_dirsort.8.xml              |    2 +-
 docs-xml/manpages-3/vfs_extd_audit.8.xml           |    2 +-
 docs-xml/manpages-3/vfs_fake_perms.8.xml           |    2 +-
 docs-xml/manpages-3/vfs_fileid.8.xml               |    2 +-
 docs-xml/manpages-3/vfs_full_audit.8.xml           |    2 +-
 docs-xml/manpages-3/vfs_gpfs.8.xml                 |    2 +-
 docs-xml/manpages-3/vfs_netatalk.8.xml             |    2 +-
 docs-xml/manpages-3/vfs_notify_fam.8.xml           |    2 +-
 docs-xml/manpages-3/vfs_prealloc.8.xml             |    2 +-
 docs-xml/manpages-3/vfs_preopen.8.xml              |    2 +-
 docs-xml/manpages-3/vfs_readahead.8.xml            |    2 +-
 docs-xml/manpages-3/vfs_readonly.8.xml             |    2 +-
 docs-xml/manpages-3/vfs_recycle.8.xml              |    2 +-
 docs-xml/manpages-3/vfs_shadow_copy.8.xml          |    2 +-
 docs-xml/manpages-3/vfs_shadow_copy2.8.xml         |    2 +-
 docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml |    2 +-
 docs-xml/manpages-3/vfs_streams_depot.8.xml        |    2 +-
 docs-xml/manpages-3/vfs_streams_xattr.8.xml        |    2 +-
 docs-xml/manpages-3/vfs_xattr_tdb.8.xml            |    2 +-
 docs-xml/manpages-3/vfstest.1.xml                  |    2 +-
 docs-xml/manpages-3/wbinfo.1.xml                   |   15 +-
 docs-xml/manpages-3/winbind_krb5_locator.7.xml     |    2 +-
 docs-xml/manpages-3/winbindd.8.xml                 |    2 +-
 docs-xml/registry/Win7_Samba3DomainMember.reg      |  Bin 0 -> 424 bytes
 docs-xml/smbdotconf/filename/manglednames.xml      |    2 +-
 docs-xml/smbdotconf/filename/mapreadonly.xml       |    2 +-
 docs-xml/smbdotconf/filename/storecreatetime.xml   |   15 -
 .../smbdotconf/filename/storedosattributes.xml     |    7 +
 docs-xml/smbdotconf/ldap/ldapfollowreferral.xml    |   21 +
 docs-xml/smbdotconf/locking/oplocks.xml            |    4 +-
 .../smbdotconf/logging/debughirestimestamp.xml     |    2 +-
 docs-xml/smbdotconf/misc/ctdbtimeout.xml           |   37 +
 docs-xml/smbdotconf/misc/dosfilemode.xml           |    8 +-
 .../smbdotconf/misc/fakedirectorycreatetimes.xml   |    2 +-
 docs-xml/smbdotconf/printing/enablespoolss.xml     |   10 +
 docs-xml/smbdotconf/protocol/maxprotocol.xml       |    5 +
 .../smbdotconf/security/accessbasedshareenum.xml   |    1 -
 docs-xml/smbdotconf/security/inheritacls.xml       |    5 +
 docs-xml/smbdotconf/security/lanmanauth.xml        |    7 +
 docs-xml/using_samba/appf.xml                      |    2 +-
 examples/misc/adssearch.pl                         |    2 +
 examples/perfcounter/Makefile                      |    6 +-
 examples/perfcounter/perf.h                        |    4 +-
 lib/tdb/common/check.c                             |  423 +
 lib/tdb/common/dump.c                              |    4 +-
 lib/tdb/common/freelist.c                          |   23 +-
 lib/tdb/common/freelistcheck.c                     |    8 +-
 lib/tdb/common/io.c                                |   43 +-
 lib/tdb/common/lock.c                              |   64 +-
 lib/tdb/common/open.c                              |   37 +-
 lib/tdb/common/tdb.c                               |  291 +-
 lib/tdb/common/tdb_private.h                       |   54 +-
 lib/tdb/common/transaction.c                       |   70 +-
 lib/tdb/common/traverse.c                          |   34 +-
 lib/tdb/config.mk                                  |    2 +-
 lib/tdb/configure.ac                               |    2 +-
 lib/tdb/docs/README                                |   11 +
 lib/tdb/docs/tracing.txt                           |   46 +
 lib/tdb/include/tdb.h                              |    5 +-
 lib/tdb/libtdb.m4                                  |    2 +-
 lib/tdb/tdb.exports                                |    1 +
 lib/tdb/tdb.signatures                             |    1 +
 lib/tdb/tools/tdbtool.c                            |   44 +-
 lib/tdb/tools/tdbtorture.c                         |   48 +-
 lib/tdr/tdr.c                                      |   10 +
 lib/tdr/tdr.h                                      |    2 +-
 lib/tevent/tevent_signal.c                         |    2 +-
 lib/tsocket/tsocket.h                              |    2 -
 lib/tsocket/tsocket_bsd.c                          |    7 +-
 lib/tsocket/tsocket_guide.txt                      |  880 +--
 lib/util/charset/util_unistr.c                     |    2 +-
 lib/util/config.mk                                 |    1 +
 lib/util/genrand.c                                 |   55 +-
 lib/util/rfc1738.c                                 |  225 +
 lib/util/talloc_stack.h                            |    2 +-
 lib/util/tests/strlist.c                           |   33 +
 lib/util/util.c                                    |   40 -
 lib/util/util.h                                    |   25 +
 lib/util/util_strlist.c                            |    2 +-
 lib/util/util_tdb.c                                |    2 +-
 libcli/util/doserr.c                               | 4872 +++++++++++-
 libcli/util/werror.h                               | 2375 ++++++-
 librpc/gen_ndr/cli_dfs.c                           |  368 -
 librpc/gen_ndr/cli_drsuapi.c                       |  400 -
 librpc/gen_ndr/cli_dssetup.c                       |  176 -
 librpc/gen_ndr/cli_echo.c                          |  160 -
 librpc/gen_ndr/cli_epmapper.c                      |  128 -
 librpc/gen_ndr/cli_eventlog.c                      |  400 -
 librpc/gen_ndr/cli_initshutdown.c                  |   48 -
 librpc/gen_ndr/cli_lsa.c                           | 1312 ---
 librpc/gen_ndr/cli_netlogon.c                      |  752 --
 librpc/gen_ndr/cli_ntsvcs.c                        | 1040 ---
 librpc/gen_ndr/cli_samr.c                          | 1088 ---
 librpc/gen_ndr/cli_spoolss.c                       | 1768 +----
 librpc/gen_ndr/cli_spoolss.h                       |    4 +-
 librpc/gen_ndr/cli_srvsvc.c                        |  864 --
 librpc/gen_ndr/cli_svcctl.c                        |  704 --
 librpc/gen_ndr/cli_winreg.c                        |  560 --
 librpc/gen_ndr/cli_wkssvc.c                        |  496 --
 librpc/gen_ndr/lsa.h                               |    8 +
 librpc/gen_ndr/ndr_dcerpc.c                        |   46 +
 librpc/gen_ndr/ndr_dfs.c                           |   64 +-
 librpc/gen_ndr/ndr_drsblobs.c                      |  107 +-
 librpc/gen_ndr/ndr_drsuapi.c                       |  212 +-
 librpc/gen_ndr/ndr_dssetup.c                       |   28 +-
 librpc/gen_ndr/ndr_echo.c                          |   22 +-
 librpc/gen_ndr/ndr_epmapper.c                      |   66 +
 librpc/gen_ndr/ndr_eventlog.c                      |   18 +-
 librpc/gen_ndr/ndr_krb5pac.c                       |   20 +
 librpc/gen_ndr/ndr_lsa.c                           |  144 +-
 librpc/gen_ndr/ndr_misc.c                          |   12 +-
 librpc/gen_ndr/ndr_named_pipe_auth.c               |   12 +
 librpc/gen_ndr/ndr_nbt.c                           |   65 +
 librpc/gen_ndr/ndr_netlogon.c                      |  158 +-
 librpc/gen_ndr/ndr_ntlmssp.c                       |   30 +-
 librpc/gen_ndr/ndr_ntsvcs.c                        |    4 +-
 librpc/gen_ndr/ndr_samr.c                          |  158 +-
 librpc/gen_ndr/ndr_schannel.c                      |   24 +-
 librpc/gen_ndr/ndr_security.c                      |   15 +-
 librpc/gen_ndr/ndr_spoolss.c                       |  242 +-
 librpc/gen_ndr/ndr_srvsvc.c                        |  246 +
 librpc/gen_ndr/ndr_svcctl.c                        |   20 +
 librpc/gen_ndr/ndr_winreg.c                        |   14 +
 librpc/gen_ndr/ndr_wkssvc.c                        |  124 +-
 librpc/gen_ndr/ndr_xattr.c                         |  256 +-
 librpc/gen_ndr/ndr_xattr.h                         |   19 +-
 librpc/gen_ndr/netlogon.h                          |    7 +
 librpc/gen_ndr/ntsvcs.h                            |    2 +-
 librpc/gen_ndr/security.h                          |    4 +
 librpc/gen_ndr/spoolss.h                           |   64 +-
 librpc/gen_ndr/srv_spoolss.c                       |    4 +-
 librpc/gen_ndr/xattr.h                             |   40 +-
 librpc/idl/lsa.idl                                 |   48 +
 librpc/idl/netlogon.idl                            |   12 +
 librpc/idl/security.idl                            |   15 +
 librpc/idl/spoolss.idl                             |   70 +-
 librpc/idl/xattr.idl                               |   53 +-
 librpc/ndr/libndr.h                                |    6 +
 librpc/ndr/ndr_basic.c                             |   96 +-
 librpc/ndr/ndr_xattr.c                             |  148 +
 librpc/ndr/ndr_xattr.h                             |   37 +
 nsswitch/libwbclient/tests/wbclient.c              |  326 +
 nsswitch/libwbclient/wbc_pam.c                     |   46 +-
 nsswitch/libwbclient/wbc_sid.c                     |    4 +
 nsswitch/libwbclient/wbc_util.c                    |    5 +-
 nsswitch/libwbclient/wbclient.c                    |    4 +-
 nsswitch/libwbclient/wbclient.h                    |   18 +-
 nsswitch/pam_winbind.c                             |   46 +-
 nsswitch/wbinfo.c                                  |   96 +-
 nsswitch/winbind_krb5_locator.c                    |    1 +
 nsswitch/winbind_struct_protocol.h                 |    1 +
 packaging/RHEL-CTDB/configure.rpm                  |    1 +
 packaging/RHEL-CTDB/makerpms.sh                    |   17 +-
 packaging/RHEL-CTDB/makespec.sh                    |   23 +-
 packaging/RHEL-CTDB/samba.spec.tmpl                |  148 +-
 packaging/RHEL/makerpms.sh.tmpl                    |    4 +-
 packaging/RHEL/samba.spec.tmpl                     |   25 +-
 pidl/lib/Parse/Pidl/NDR.pm                         |    2 +
 pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm            |   26 -
 pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm           |    4 +
 pidl/lib/Parse/Pidl/Samba4/TDR.pm                  |    6 +-
 pidl/lib/Parse/Pidl/Typelist.pm                    |    4 +-
 pidl/tests/typelist.pl                             |    2 +-
 release-scripts/create-tarball                     |   13 +
 source3/Makefile.in                                |  244 +-
 source3/auth/auth_domain.c                         |    6 +-
 source3/auth/auth_netlogond.c                      |   12 +-
 source3/auth/auth_util.c                           |   10 +-
 source3/auth/pampass.c                             |    2 +-
 source3/change-log                                 |    2 +-
 source3/client/client.c                            |   73 +-
 source3/configure.in                               |  194 +-
 source3/include/includes.h                         |   26 +-
 source3/include/nss_info.h                         |    6 +-
 source3/include/nt_printing.h                      |  108 -
 source3/include/packet.h                           |    3 +-
 source3/include/passdb.h                           |    5 +-
 source3/include/proto.h                            |  195 +-
 source3/include/rpc_misc.h                         |   20 -
 source3/include/rpc_perfcount.h                    |  126 -
 source3/include/rpc_perfcount_defs.h               |   93 -
 source3/include/secrets.h                          |   12 -
 source3/include/smb.h                              |   12 +
 source3/include/vfs.h                              |   18 +-
 source3/include/vfs_macros.h                       |   16 +-
 source3/lib/ctdbd_conn.c                           |   16 +-
 source3/lib/dbwrap_ctdb.c                          |  234 +-
 source3/lib/dbwrap_util.c                          |   20 +-
 source3/lib/debug.c                                |   19 +-
 source3/lib/gencache.c                             |   12 +-
 source3/lib/interface.c                            |   10 +-
 source3/lib/ldb/ldb_tdb/ldb_tdb.h                  |    6 -
 source3/lib/netapi/cm.c                            |    2 +-
 source3/lib/netapi/examples/Makefile.in            |   20 +-
 .../netapi/examples/netlogon/netlogon_control.c    |  143 +
 .../netapi/examples/netlogon/netlogon_control2.c   |  147 +
 source3/lib/netapi/examples/netlogon/nltest.c      |  251 +
 source3/lib/netapi/group.c                         |    8 +-
 source3/lib/netapi/libnetapi.c                     |   94 +
 source3/lib/netapi/libnetapi.h                     |   17 +
 source3/lib/netapi/netapi.h                        |   92 +-
 source3/lib/netapi/netlogon.c                      |  240 +
 source3/lib/packet.c                               |   10 +-
 source3/lib/smbldap.c                              |   20 +-
 source3/lib/system.c                               |   10 +-
 source3/lib/time.c                                 |   52 +-
 source3/lib/util.c                                 |   12 +-
 source3/lib/util_nscd.c                            |    2 +-
 source3/lib/util_reg.c                             |   23 -
 source3/lib/util_reg_api.c                         |   88 +-
 source3/lib/util_sid.c                             |    2 +-
 source3/lib/util_unistr.c                          |   35 -
 source3/libads/authdata.c                          |   14 +-
 source3/libads/dns.c                               |    3 +-
 source3/libads/kerberos.c                          |    4 +-
 source3/libads/util.c                              |    2 +-
 source3/libnet/libnet_join.c                       |    5 +-
 source3/librpc/gen_ndr/cli_wbint.c                 |  478 +-
 source3/librpc/gen_ndr/cli_wbint.h                 |    8 +
 source3/librpc/gen_ndr/libnetapi.h                 |   88 +-
 source3/librpc/gen_ndr/messaging.h                 |  104 +-
 source3/librpc/gen_ndr/ndr_libnetapi.c             |  390 +-
 source3/librpc/gen_ndr/ndr_libnetapi.h             |   12 +-
 source3/librpc/gen_ndr/ndr_messaging.c             |   16 +-
 source3/librpc/gen_ndr/ndr_notify.c                |   10 +
 source3/librpc/gen_ndr/ndr_perfcount.c             |  505 ++
 source3/librpc/gen_ndr/ndr_perfcount.h             |   26 +
 source3/librpc/gen_ndr/ndr_secrets.c               |   79 +
 source3/librpc/gen_ndr/ndr_secrets.h               |   13 +
 source3/librpc/gen_ndr/ndr_wbint.c                 |  173 +-
 source3/librpc/gen_ndr/ndr_wbint.h                 |   11 +-
 source3/librpc/gen_ndr/perfcount.h                 |  129 +
 source3/librpc/gen_ndr/secrets.h                   |   19 +
 source3/librpc/gen_ndr/srv_wbint.c                 |   80 +
 source3/librpc/gen_ndr/srv_wbint.h                 |    2 +
 source3/librpc/gen_ndr/wbint.h                     |    8 +
 source3/librpc/idl/libnetapi.idl                   |   49 +
 source3/librpc/idl/perfcount.idl                   |  172 +
 source3/librpc/idl/secrets.idl                     |   27 +
 source3/librpc/idl/wbint.idl                       |    5 +-
 source3/libsmb/clidfs.c                            |   29 +-
 source3/libsmb/clifile.c                           |  144 +
 source3/libsmb/clifsinfo.c                         |  164 +-
 source3/libsmb/clikrb5.c                           |  349 +-
 source3/libsmb/clilist.c                           |   20 +-
 source3/libsmb/climessage.c                        |  445 +-
 source3/libsmb/clispnego.c                         |   37 +-
 source3/libsmb/dsgetdcname.c                       |    2 +-
 source3/libsmb/libsmb_dir.c                        |   21 +-
 source3/libsmb/libsmb_server.c                     |  155 +-
 source3/libsmb/passchange.c                        |    4 +-
 source3/libsmb/trusts_util.c                       |   62 +-
 source3/locking/brlock.c                           |  432 +-
 source3/locking/locking.c                          |   30 +-
 source3/modules/nfs4_acls.c                        |    2 +-
 source3/modules/onefs_open.c                       |    4 +-
 source3/modules/vfs_acl_common.c                   |  119 +-
 source3/modules/vfs_acl_tdb.c                      |   58 +-
 source3/modules/vfs_acl_xattr.c                    |   16 +
 source3/modules/vfs_afsacl.c                       |    9 +-
 source3/modules/vfs_catia.c                        |   23 +-
 source3/modules/vfs_default.c                      |   63 +-
 source3/modules/vfs_full_audit.c                   |   15 +-
 source3/modules/vfs_gpfs.c                         |    6 +-
 source3/modules/vfs_hpuxacl.c                      |    7 +-
 source3/modules/vfs_shadow_copy2.c                 |  147 +-
 source3/modules/vfs_streams_depot.c                |   14 +-
 source3/modules/vfs_streams_xattr.c                |    7 +-
 source3/modules/vfs_xattr_tdb.c                    |    8 +-
 source3/param/loadparm.c                           |   52 +-
 source3/passdb/lookup_sid.c                        |   13 +-
 source3/passdb/passdb.c                            |    6 +-
 source3/passdb/pdb_ads.c                           |   63 +-
 source3/passdb/pdb_interface.c                     |   34 +-
 source3/passdb/pdb_ldap.c                          |   97 +-
 source3/passdb/secrets.c                           |  337 +-
 source3/passdb/secrets_schannel.c                  |   63 +
 source3/passdb/util_unixsids.c                     |   10 +-
 source3/passdb/util_wellknown.c                    |    1 +
 source3/printing/nt_printing.c                     |  852 +--
 source3/printing/printfsp.c                        |    9 +-
 source3/registry/reg_backend_db.c                  |    6 +-
 source3/registry/reg_backend_printing.c            |   70 +-
 source3/registry/reg_objects.c                     |   26 +-
 source3/registry/reg_perfcount.c                   |  235 +-
 source3/rpc_client/cli_lsarpc.c                    |    3 +-
 source3/rpc_client/cli_netlogon.c                  |   34 +-
 source3/rpc_client/cli_pipe.c                      |  267 +-
 source3/rpc_client/cli_reg.c                       |   62 -
 source3/rpc_client/cli_spoolss.c                   |   24 +-
 source3/rpc_client/ndr.c                           |   13 +-
 source3/rpc_client/rpc_transport_np.c              |    4 +-
 source3/rpc_parse/parse_misc.c                     |   42 -
 source3/rpc_parse/parse_prs.c                      |   46 +-
 source3/rpc_server/srv_lsa_hnd.c                   |   10 +-
 source3/rpc_server/srv_lsa_nt.c                    |  201 +-
 source3/rpc_server/srv_netlog_nt.c                 |  419 +-
 source3/rpc_server/srv_pipe.c                      |   67 +-
 source3/rpc_server/srv_pipe_hnd.c                  |   53 +-
 source3/rpc_server/srv_samr_nt.c                   |    4 +-
 source3/rpc_server/srv_spoolss_nt.c                |  544 +-
 source3/rpcclient/cmd_lsarpc.c                     |  134 +
 source3/rpcclient/cmd_netlogon.c                   |    2 +-
 source3/rpcclient/cmd_shutdown.c                   |    2 +-
 source3/rpcclient/cmd_spoolss.c                    |   12 +-
 source3/rpcclient/rpcclient.c                      |   30 +-
 source3/samba4.mk                                  |   13 +-
 source3/script/tests/selftest.sh                   |   17 +-
 source3/script/tests/test_posix_s3.sh              |   20 +-
 source3/script/tests/test_smbclient_s3.sh          |   45 +
 source3/script/tests/test_smbtorture_s3.sh         |    4 +-
 source3/services/services_db.c                     |   14 +-
 source3/smbd/aio.c                                 |   72 +-
 source3/smbd/blocking.c                            |   41 +-
 source3/smbd/change_trust_pw.c                     |    2 +-
 source3/smbd/close.c                               |   77 +-
 source3/smbd/dir.c                                 |  129 +-
 source3/smbd/dosmode.c                             |  272 +-
 source3/smbd/fileio.c                              |   58 +-
 source3/smbd/filename.c                            |  163 +-
 source3/smbd/filename_util.c                       |    6 +-
 source3/smbd/files.c                               |   32 +-
 source3/smbd/lanman.c                              |   61 +-
 source3/smbd/msdfs.c                               |   39 +-
 source3/smbd/negprot.c                             |   13 +-
 source3/smbd/notify.c                              |   16 +-
 source3/smbd/notify_internal.c                     |    6 +-
 source3/smbd/nttrans.c                             |  108 +-
 source3/smbd/open.c                                |   75 +-
 source3/smbd/oplock.c                              |   10 +-
 source3/smbd/oplock_onefs.c                        |    8 +-
 source3/smbd/posix_acls.c                          |  287 +-
 source3/smbd/process.c                             |   30 +-
 source3/smbd/reply.c                               |  244 +-
 source3/smbd/service.c                             |    6 +-
 source3/smbd/sesssetup.c                           |    6 +-
 source3/smbd/smb2_create.c                         |   40 +-
 source3/smbd/smb2_negprot.c                        |    4 +-
 source3/smbd/statcache.c                           |   18 +-
 source3/smbd/trans2.c                              |  110 +-
 source3/smbd/vfs.c                                 |  129 +-
 source3/torture/torture.c                          |  633 ++-
 source3/utils/net.c                                |    4 +-
 source3/utils/net_ads.c                            |   10 +-
 source3/utils/net_proto.h                          |    2 +-
 source3/utils/net_rpc.c                            |   99 +-
 source3/utils/net_rpc_audit.c                      |   10 +-
 source3/utils/net_rpc_join.c                       |    6 +-
 source3/utils/net_rpc_printer.c                    |   12 +-
 source3/utils/net_rpc_registry.c                   |   50 +-
 source3/utils/net_rpc_shell.c                      |    2 +-
 source3/utils/net_sam.c                            |    2 +-
 source3/utils/net_util.c                           |    2 +-
 source3/utils/ntlm_auth.c                          |    8 +-
 source3/utils/pdbedit.c                            |   32 +-
 source3/utils/smbcacls.c                           |    2 +-
 source3/utils/smbtree.c                            |    2 +-
 source3/winbindd/idmap_adex/provider_unified.c     |    1 -
 source3/winbindd/idmap_ldap.c                      |    5 +
 source3/winbindd/winbindd.c                        |    2 +
 source3/winbindd/winbindd_ads.c                    |    4 +-
 source3/winbindd/winbindd_cache.c                  |    2 +
 source3/winbindd/winbindd_change_machine_acct.c    |   93 +
 source3/winbindd/winbindd_check_machine_acct.c     |   11 +-
 source3/winbindd/winbindd_cm.c                     |   10 +-
 source3/winbindd/winbindd_dual.c                   |   70 +-
 source3/winbindd/winbindd_dual_srv.c               |   72 +-
 source3/winbindd/winbindd_misc.c                   |    2 +-
 source3/winbindd/winbindd_pam.c                    |   20 +-
 source3/winbindd/winbindd_proto.h                  |    7 +
 source4/build/m4/check_path.m4                     |    2 +-
 source4/client/tests/test_smbclient.sh             |    2 +-
 source4/dsdb/samdb/ldb_modules/descriptor.c        |    1 +
 source4/libnet/libnet_samsync_ldb.c                |    2 +-
 source4/librpc/config.mk                           |    2 +-
 source4/librpc/idl/irpc.idl                        |    2 +-
 source4/librpc/idl/winsif.idl                      |    4 +-
 source4/min_versions.m4                            |    2 +-
 source4/rpc_server/lsa/dcesrv_lsa.c                |    9 +
 source4/torture/basic/base.c                       |    4 +
 source4/torture/basic/cxd_known.h                  | 8670 ++++++++++++++++++++
 source4/torture/basic/delaywrite.c                 |  144 +-
 source4/torture/basic/denytest.c                   |  748 ++-
 source4/torture/libnet/libnet_group.c              |    1 -
 source4/torture/raw/rename.c                       |   44 +-
 source4/torture/raw/tconrate.c                     |    1 +
 source4/torture/rpc/lsa.c                          |  287 +-
 source4/torture/rpc/netlogon.c                     |  181 +-
 source4/torture/rpc/rpc.c                          |    1 +
 source4/torture/rpc/samr.c                         |    4 +-
 source4/torture/rpc/samsync.c                      |    2 +-
 source4/torture/rpc/session_key.c                  |   25 +-
 source4/torture/rpc/spoolss.c                      |   81 +
 source4/torture/rpc/spoolss_win.c                  |   22 +-
 source4/torture/rpc/wkssvc.c                       |    8 +-
 source4/torture/smbtorture.c                       |   10 +-
 source4/torture/smbtorture.h                       |   23 +
 source4/torture/winbind/config.mk                  |    4 +-
 source4/torture/winbind/winbind.c                  |    1 +
 465 files changed, 32710 insertions(+), 16526 deletions(-)
 create mode 100644 docs-xml/registry/Win7_Samba3DomainMember.reg
 delete mode 100644 docs-xml/smbdotconf/filename/storecreatetime.xml
 create mode 100644 docs-xml/smbdotconf/ldap/ldapfollowreferral.xml
 create mode 100644 docs-xml/smbdotconf/misc/ctdbtimeout.xml
 create mode 100644 docs-xml/smbdotconf/printing/enablespoolss.xml
 create mode 100644 lib/tdb/common/check.c
 create mode 100644 lib/tdb/docs/tracing.txt
 create mode 100644 lib/util/rfc1738.c
 create mode 100644 librpc/ndr/ndr_xattr.c
 create mode 100644 librpc/ndr/ndr_xattr.h
 create mode 100644 nsswitch/libwbclient/tests/wbclient.c
 delete mode 100644 source3/include/rpc_perfcount.h
 delete mode 100644 source3/include/rpc_perfcount_defs.h
 create mode 100644 source3/lib/netapi/examples/netlogon/netlogon_control.c
 create mode 100644 source3/lib/netapi/examples/netlogon/netlogon_control2.c
 create mode 100644 source3/lib/netapi/examples/netlogon/nltest.c
 create mode 100644 source3/lib/netapi/netlogon.c
 create mode 100644 source3/librpc/gen_ndr/ndr_perfcount.c
 create mode 100644 source3/librpc/gen_ndr/ndr_perfcount.h
 create mode 100644 source3/librpc/gen_ndr/ndr_secrets.c
 create mode 100644 source3/librpc/gen_ndr/ndr_secrets.h
 create mode 100644 source3/librpc/gen_ndr/perfcount.h
 create mode 100644 source3/librpc/gen_ndr/secrets.h
 create mode 100644 source3/librpc/idl/perfcount.idl
 create mode 100644 source3/librpc/idl/secrets.idl
 delete mode 100644 source3/rpc_client/cli_reg.c
 create mode 100644 source3/winbindd/winbindd_change_machine_acct.c
 create mode 100644 source4/torture/basic/cxd_known.h


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 43f7846..4b88d4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,8 +192,6 @@ source4/libcli/libcli_proto.h
 libcli/nbt/nbtname.h
 libcli/smb/smb_common_proto.h
 source4/libcli/nbt/nbt_proto.h
-source4/libcli/ndr_netlogon_proto.h
-source4/libcli/netlogon_proto.h
 source4/libcli/raw/raw_proto.h
 source4/libcli/resolve/lp_proto.h
 source4/libcli/resolve/proto.h
diff --git a/README.Coding b/README.Coding
index 36dcb18..2e7dd2f 100644
--- a/README.Coding
+++ b/README.Coding
@@ -11,7 +11,7 @@ Coding style guidelines are about reducing the number of unnecessary
 reformatting patches and making things easier for developers to work together.
 You don't have to like them or even agree with them, but once put in place
 we all have to abide by them (or vote to change them).  However, coding
-style should never outweigh coding itself and so the the guidelines
+style should never outweigh coding itself and so the guidelines
 described here are hopefully easy enough to follow as they are very
 common and supported by tools and editors.
 
@@ -25,18 +25,18 @@ are the highlights.
 * Maximum Line Width is 80 Characters
   The reason is not for people with low-res screens but rather sticking
   to 80 columns prevents you from easily nesting more than one level of
-  if statements or other code blocks.  Use source/script/count_80_col.pl
+  if statements or other code blocks.  Use source3/script/count_80_col.pl
   to check your changes.
 
 * Use 8 Space Tabs to Indent
   No whitespace filler.
 
 * No Trailing Whitespace
-  Use source/script/strip_trail_ws.pl to clean you files before committing.
+  Use source3/script/strip_trail_ws.pl to clean you files before committing.
 
 * Follow the K&R guidelines.  We won't go throw them all here.  You have
   a copy of "The C Programming Language" anyways right?  You can also use
-  the format_indent.sh script found in source/script/ if all else fails.
+  the format_indent.sh script found in source3/script/ if all else fails.
 
 
 
@@ -58,7 +58,7 @@ Vi
 --
 (Thanks to SATOH Fumiyasu <fumiyas at osstech.jp> for these hints):
 
-For the basic vi editor including with all variants of \*nix, add the 
+For the basic vi editor included with all variants of \*nix, add the
 following to $HOME/.exrc:
 
   set tabstop=8
@@ -99,7 +99,7 @@ Indention & Whitespace & 80 columns
 
 To avoid confusion, indentations are to be 8 character with tab (not 
 8 ' ' characters.  When wrapping parameters for function calls, 
-alignment parameter list with the first parameter on the previous line.
+align the parameter list with the first parameter on the previous line.
 Use tabs to get as close as possible and then fill in the final 7 
 characters or less with whitespace.  For example,
 
@@ -132,7 +132,7 @@ Note that this is a rule about parentheses following keywords and not
 functions.  Don't insert a space between the name and left parentheses when 
 invoking functions.
 
-Braces for code blocks used by for, if, switch, while, do..while, etc...
+Braces for code blocks used by for, if, switch, while, do..while, etc.
 should begin on the same line as the statement keyword and end on a line 
 of their own.  NOTE: Functions are different and the beginning left brace
 should begin on a line of its own.
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 066f718..9823d89 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,36 +1,113 @@
                    =================================
-                   Release Notes for Samba 3.4.0pre1
+                   Release Notes for Samba 3.5.0pre1
 
                    =================================
 
-This is the first preview release of Samba 3.4.  This is *not*
+This is the first preview release of Samba 3.5.  This is *not*
 intended for production environments and is designed for testing
 purposes only.  Please report any defects via the Samba bug reporting
 system at https://bugzilla.samba.org/.
 
-Major enhancements in Samba 3.4.0 include:
+Major enhancements in Samba 3.5.0 include:
 
-Authentication Changes:
-o Changed the way smbd handles untrusted domain names given during user
-  authentication
+General changes:
+o Add support for full Windows timestamp resolution
 
-Authentication Changes
-======================
+Protocol changes:
+o Experimental implementation of SMB2
 
-Previously, when Samba was a domain member and a client was connecting using an
-untrusted domain name, such as BOGUS\user smbd would remap the untrusted
-domain to the primary domain smbd was a member of and attempt authentication
-using that DOMAIN\user name.  This differed from how a Windows member server
-would behave.  Now, smbd will replace the BOGUS name with it's SAM name.  In
-the case where smbd is acting as a PDC this will be DOMAIN\user.  In the case
-where smbd is acting as a domain member server this will be WORKSTATION\user.
-Thus, smbd will never assume that an incoming user name which is not qualified
-with the same primary domain, is part of smbd's primary domain.
+Printing Changes:
+o Add encryption support for connections to a CUPS server
+
+Winbind changes:
+o Major refactoring
+o Asynchronous
+
+General changes:
+================
+
+Support for full Windows timestamp resolution has been added. This effectively
+makes us use Windows' full 100ns timestamp resolution if supported by the
+kernel (2.6.22 and higher) and the glibc (2.6 and higher).
+
+Protocol changes
+================
+
+An EXPERIMENTAL implementation of the SMB2 protocol has been added. SMB2 can be
+enabled by setting "max protocol = smb2". SMB2 is a new implementation of the
+SMB protocol used by Windows Vista and higher.
+
+Printing Changes
+================
+
+A new parameter "cups encrypt" has been added to control whether connections to
+CUPS servers will be encrypted or not. The default is to use unencrypted
+connections.
+
+Winbind changes
+===============
+
+The Winbind daemon has been refactored internally to be asynchronous. The new
+Winbind will not be blocked by running 'wbinfo -g' or 'wbinfo -u'.
+
+
+######################################################################
+Changes
+#######
+
+smb.conf changes
+----------------
+
+   Parameter Name                      Description     Default
+   --------------                      -----------     -------
+
+   create krb5 conf		       New	       yes
+   ctdb timeout			       New	       0
+   cups encrypt			       New	       no
+   debug hires timestamp	       Changed Default yes
+   ldap follow referral		       New	       auto
+
+
+New [sub]commands
+-----------------
+
+
+
+New configure options
+---------------------
+
+--enable-external-libtalloc	Enable external tdb
+--enable-netapi			Turn on netapi support
+--enable-pthreadpool		Enable pthreads pool helper support
+--with-cifsumount		Include umount.cifs (Linux only) support
+--with-codepagedir=DIR		Where to put codepages
+
+
+Commit Highlights
+=================
+
+
+o   Jeremy Allison <jra at samba.org>
+    *
+
+
+o   Günther Deschner <gd at samba.org>
+    *
+
+
+o   Björn Jacke <bjacke at sernet.de>
+    * Add support for full Windows timestamp resolution.
+    * Add encryption support for connections to a CUPS server.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * Major internal refactoring of the Winbind daemon.
+    * Make Winbind asynchronous.
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * Implement the new SMB2 protocol (experimental).
 
-While this behavior matches Windows, it may break some workflows which depended
-on smbd to always pass through bogus names to the DC for verification.  A new
-parameter "map untrusted to domain" can be enabled to revert to the legacy
-behavior.
 
 ######################################################################
 Reporting bugs & Development Discussion
@@ -42,7 +119,7 @@ joining the #samba-technical IRC channel on irc.freenode.net.
 If you do report problems then please try to send high quality
 feedback. If you don't provide vital information to help us track down
 the problem then you will probably be ignored.  All bug reports should
-be filed under the Samba 3.4 product in the project's Bugzilla
+be filed under the Samba 3.5 product in the project's Bugzilla
 database (https://bugzilla.samba.org/).
 
 
diff --git a/client/cifs.upcall.c b/client/cifs.upcall.c
index bf6a861..063e423 100644
--- a/client/cifs.upcall.c
+++ b/client/cifs.upcall.c
@@ -45,18 +45,6 @@ typedef enum _sectype {
 	MS_KRB5
 } sectype_t;
 
-static inline int
-k5_data_equal(krb5_data d1, krb5_data d2, unsigned int length)
-{
-	if (!length)
-		length = d1.length;
-
-	return (d1.length == length &&
-		d1.length == d2.length &&
-		memcmp(d1.data, d2.data, length) == 0);
-
-}
-
 /* does the ccache have a valid TGT? */
 static time_t
 get_tgt_time(const char *ccname) {
@@ -65,9 +53,8 @@ get_tgt_time(const char *ccname) {
 	krb5_cc_cursor cur;
 	krb5_creds creds;
 	krb5_principal principal;
-	krb5_data tgt = { .data =	"krbtgt",
-			  .length =	6 };
 	time_t credtime = 0;
+	char *realm = NULL;
 
 	if (krb5_init_context(&context)) {
 		syslog(LOG_DEBUG, "%s: unable to init krb5 context", __func__);
@@ -94,20 +81,33 @@ get_tgt_time(const char *ccname) {
 		goto err_ccstart;
 	}
 
+	if ((realm = smb_krb5_principal_get_realm(context, principal)) == NULL) {
+		syslog(LOG_DEBUG, "%s: unable to get realm", __func__);
+		goto err_ccstart;
+	}
+
 	while (!credtime && !krb5_cc_next_cred(context, ccache, &cur, &creds)) {
-		if (k5_data_equal(creds.server->realm, principal->realm, 0) &&
-		    k5_data_equal(creds.server->data[0], tgt, tgt.length) &&
-		    k5_data_equal(creds.server->data[1], principal->realm, 0) &&
+		char *name;
+		if (smb_krb5_unparse_name(NULL, context, creds.server, &name)) {
+			syslog(LOG_DEBUG, "%s: unable to unparse name", __func__);
+			goto err_endseq;
+		}
+		if (krb5_realm_compare(context, creds.server, principal) &&
+		    strnequal(name, KRB5_TGS_NAME, KRB5_TGS_NAME_SIZE) &&
+		    strnequal(name+KRB5_TGS_NAME_SIZE+1, realm, strlen(realm)) &&
 		    creds.times.endtime > time(NULL))
 			credtime = creds.times.endtime;
                 krb5_free_cred_contents(context, &creds);
+		TALLOC_FREE(name);
         }
+err_endseq:
         krb5_cc_end_seq_get(context, ccache, &cur);
-
 err_ccstart:
 	krb5_free_principal(context, principal);
 err_princ:
+#if defined(KRB5_TC_OPENCLOSE)
 	krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE);
+#endif
 	krb5_cc_close(context, ccache);
 err_cache:
 	krb5_free_context(context);
@@ -221,7 +221,7 @@ handle_krb5_mech(const char *oid, const char *principal, DATA_BLOB *secblob,
 
 	/* get a kerberos ticket for the service and extract the session key */
 	retval = cli_krb5_get_ticket(principal, 0, &tkt, sess_key, 0, ccname,
-				     NULL);
+				     NULL, NULL);
 
 	if (retval) {
 		syslog(LOG_DEBUG, "%s: failed to obtain service ticket (%d)",
diff --git a/client/mount.cifs.c b/client/mount.cifs.c
index 1c04e13..3baaad7 100644
--- a/client/mount.cifs.c
+++ b/client/mount.cifs.c
@@ -320,6 +320,11 @@ static int open_cred_file(char * file_name)
 	char * temp_val;
 	FILE * fs;
 	int i, length;
+
+	i = access(file_name, R_OK);
+	if (i)
+		return i;
+
 	fs = fopen(file_name,"r");
 	if(fs == NULL)
 		return errno;
@@ -442,6 +447,12 @@ static int get_password_from_file(int file_descript, char * filename)
 	}
 
 	if(filename != NULL) {
+		rc = access(filename, R_OK);
+		if (rc) {
+			fprintf(stderr, "mount.cifs failed: access check of %s failed: %s\n",
+					filename, strerror(errno));
+			exit(EX_SYSERR);
+		}
 		file_descript = open(filename, O_RDONLY);
 		if(file_descript < 0) {
 			fprintf(stderr, "mount.cifs failed. %s attempting to open password file %s\n",
@@ -501,9 +512,6 @@ static int parse_options(char ** optionsp, unsigned long * filesys_flags)
 		return 1;
 	data = *optionsp;
 
-	if(verboseflag)
-		fprintf(stderr, "parsing options: %s\n", data);
-
 	/* BB fixme check for separator override BB */
 
 	if (getuid()) {
@@ -594,14 +602,23 @@ static int parse_options(char ** optionsp, unsigned long * filesys_flags)
 				} else
 					got_password = 1;
 			} else if (strnlen(value, MOUNT_PASSWD_SIZE) < MOUNT_PASSWD_SIZE) {
-				if(got_password)
+				if (got_password) {
 					fprintf(stderr, "\nmount.cifs warning - password specified twice\n");
-				got_password = 1;
+				} else {
+					mountpassword = strndup(value, MOUNT_PASSWD_SIZE);
+					if (!mountpassword) {
+						fprintf(stderr, "mount.cifs error: %s", strerror(ENOMEM));
+						SAFE_FREE(out);
+						return 1;
+					}
+					got_password = 1;
+				}
 			} else {
 				fprintf(stderr, "password too long\n");
 				SAFE_FREE(out);
 				return 1;
 			}
+			goto nocopy;
 		} else if (strncmp(data, "sec", 3) == 0) {
 			if (value) {
 				if (!strncmp(value, "none", 4) ||
@@ -1501,15 +1518,6 @@ mount_retry:
 			strlcat(options,domain_name,options_size);
 		}
 	}
-	if(mountpassword) {
-		/* Commas have to be doubled, or else they will
-		look like the parameter separator */
-/*		if(sep is not set)*/
-		if(retry == 0)
-			check_for_comma(&mountpassword);
-		strlcat(options,",pass=",options_size);
-		strlcat(options,mountpassword,options_size);
-	}
 
 	strlcat(options,",ver=",options_size);
 	strlcat(options,MOUNT_CIFS_VERSION_MAJOR,options_size);
@@ -1522,8 +1530,6 @@ mount_retry:
 		strlcat(options,",prefixpath=",options_size);
 		strlcat(options,prefixpath,options_size); /* no need to cat the / */
 	}
-	if(verboseflag)
-		fprintf(stderr, "\nmount.cifs kernel mount options %s \n",options);
 
 	/* convert all '\\' to '/' in share portion so that /proc/mounts looks pretty */
 	replace_char(dev_name, '\\', '/', strlen(share_name));
@@ -1565,6 +1571,25 @@ mount_retry:
 			 addr6->sin6_scope_id);
 	}
 
+	if(verboseflag)
+		fprintf(stderr, "\nmount.cifs kernel mount options: %s", options);
+
+	if (mountpassword) {
+		/*
+		 * Commas have to be doubled, or else they will
+		 * look like the parameter separator
+		 */
+		if(retry == 0)
+			check_for_comma(&mountpassword);
+		strlcat(options,",pass=",options_size);
+		strlcat(options,mountpassword,options_size);
+		if (verboseflag)
+			fprintf(stderr, ",pass=********");
+	}
+
+	if (verboseflag)
+		fprintf(stderr, "\n");
+
 	if (!fakemnt && mount(dev_name, mountpoint, "cifs", flags, options)) {
 		switch (errno) {
 		case ECONNREFUSED:
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml b/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml
index fb66f66..d017863 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml
@@ -484,7 +484,7 @@ with the version of Windows.
 	A Samba administrator account (i.e., a Samba account that has <literal>root</literal> privileges on the
 	Samba server) must be entered here; the operation will fail if an ordinary user account is given.
 	The necessary privilege can be assured by creating a Samba SAM account for <literal>root</literal> or
-	by granting the <literal>SeMachineAccountPrivilege</literal> privilage to the user account.
+	by granting the <literal>SeMachineAccountPrivilege</literal> privilege to the user account.
 	</para>
 
 	<para>
diff --git a/docs-xml/manpages-3/cifs.upcall.8.xml b/docs-xml/manpages-3/cifs.upcall.8.xml
index 251d1d0..05a5e0a 100644
--- a/docs-xml/manpages-3/cifs.upcall.8.xml
+++ b/docs-xml/manpages-3/cifs.upcall.8.xml
@@ -8,7 +8,7 @@
         <manvolnum>8</manvolnum>
         <refmiscinfo class="source">Samba</refmiscinfo>
         <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-        <refmiscinfo class="version">3.6</refmiscinfo>
+        <refmiscinfo class="version">3.5</refmiscinfo>
 </refmeta>
 
 <refnamediv>
diff --git a/docs-xml/manpages-3/eventlogadm.8.xml b/docs-xml/manpages-3/eventlogadm.8.xml
index 4c399a3..ce8ab23 100644
--- a/docs-xml/manpages-3/eventlogadm.8.xml
+++ b/docs-xml/manpages-3/eventlogadm.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.6</refmiscinfo>
+	<refmiscinfo class="version">3.5</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/findsmb.1.xml b/docs-xml/manpages-3/findsmb.1.xml
index 92bcbbe..1d1889b 100644
--- a/docs-xml/manpages-3/findsmb.1.xml
+++ b/docs-xml/manpages-3/findsmb.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.6</refmiscinfo>
+	<refmiscinfo class="version">3.5</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml
index 8465b10..01e059a 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.6</refmiscinfo>
+	<refmiscinfo class="version">3.5</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/idmap_adex.8.xml b/docs-xml/manpages-3/idmap_adex.8.xml
index 7349caa..a9cac8e 100644
--- a/docs-xml/manpages-3/idmap_adex.8.xml
+++ b/docs-xml/manpages-3/idmap_adex.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.6</refmiscinfo>
+	<refmiscinfo class="version">3.5</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/idmap_hash.8.xml b/docs-xml/manpages-3/idmap_hash.8.xml
index 2bbae71..2c886f3 100644


-- 
Samba Shared Repository