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

Karolin Seeger kseeger at samba.org
Tue Dec 8 03:03:48 MST 2009


The branch, v3-5-stable has been updated
       via  352adf3... WHATSNEW: Add changes since 3.5.0pre1.
       via  540008b... s3: check if glibc has broken posix_fallocate (cherry picked from commit 5062e190ed27e16145d9275533b6dd5bcb10209e)
       via  68c70fe... packaging(RHEL-CTDB): clean some commented out lines from the files sections
       via  43edc9f... packaging(RHEL-CTDB): explicitly list library versions in samba-winbind-32bit
       via  48fd517... packaging(RHEL-CTDB): explicitly list library versions in samba-common
       via  de820ff... packaging(RHEL-CTDB): explicitly list all packaged idmap/nss-info/charset modules
       via  d887667... packaging(RHEL-CTDB): explicitly list all the vfs modules in the main package
       via  3d9b08c... packaging(RHEL-CTDB): add some checks to test the built smbd
       via  93af3ab... packaging(RHEL-CTDB): make everything instead of all in the build stage
       via  a8190d1... parent_sd can never be null in this function, so don't check for it.
       via  5f3724d... Hopefullt final fix for 6802 - acl_xattr.c module: A created folder does not properly inherit permissions from parent and 6938 - No hook exists to check creation rights when using acl_xattr module
       via  850b375... s3: let gencache_init() use tdb_check()
       via  05927ff... s3: let netsamlogon_cache_init() use tdb_check()
       via  830f18c... s3: let tdb_validate_child() use tdb_check()
       via  1af7a63... s3: require tdb 1.1.7 with tdb_check()
       via  0cc8802... s3:docs: Document "directory name cache size".
       via  27ba4af... s3: de-deprecate "write cache size" to prevent its removal without a proper alternative (cherry picked from commit 950857f6ba7f0ff4e238b600fc0e6c10c972e582)
       via  b326771... create-tarball: Readd RFCs (fixes the merged build).
       via  d65264f... s4-smbtorture: disable some spoolss printerdata tests which s3 does not pass at the moment.
       via  77379dc... s3: fix net and rpcclient after setprinterdataex changes.
       via  2ce37d0... s4-smbtorture: fix RPC-SPOOLSS after _spoolss_SetPrinterDataEx IDL change.
       via  6f30f47... s3-spoolss: let _spoolss_DeletePrinterData call into _spoolss_DeletePrinterDataEx.
       via  26fe7c5... s3-spoolss: let _spoolss_SetPrinterData call into _spoolss_SetPrinterDataEx.
       via  0db6d1b... s3-spoolss: let _spoolss_GetPrinterData call into _spoolss_GetPrinterDataEx.
       via  e6682d5... spoolss: rework spoolss_GetPrinterDataEx and spoolss_SetPrinterDataEx.
       via  f251453... s3-spoolss: a default printer should have at least a "PrintDriverData" key.
       via  945623f... s3-winreg: fill in some inline comments.
       via  3d952e3... s3-winreg: remove trailing whitespace.
       via  f6512c4... s4-smbtorture: heavily expand printerdata tests in RPC-SPOOLSS.
       via  e315e45... s3-spoolss: handle SEC_FLAG_MAXIMUM_ALLOWED in spoolss_OpenPrinterEx.
       via  6cfe8a2... s4-smbtorture: check more WERRORs in RPC-SPOOLSS.
       via  df4c66c... s4-smbtorture: call test_EnumPrinterDrivers with architecture in RPC-SPOOLSS.
       via  aa0ad60... s3:auth: Fix typo in debug message.
       via  1fb641e... examples: Fix the build of the example VFS modules.
       via  91829a6... streamline some log levels for invalid servicenames
       via  c89ab0f... s3: Fix a const discard warning (cherry picked from commit d8a40f1227132d49051ddbc2bb9727ee3956d86c)
       via  ef41db6... s3: talloc_array_length deals file with a NULL argument (cherry picked from commit 0249e477edee01ba4185db8ffada537e8bae8e79)
       via  9b89fa0... s3: Small simplification: qsort deals fine with just one entry (cherry picked from commit 3c5e571a2f1b6d32b735e26949b9739fc960c22b)
       via  384380c... s3: Simplify usr_info_cmp by calling timeval_compare() (cherry picked from commit 4b3ad2547c452dd9493fe63e056346a5f7561a37)
       via  d089149... s3: Add rpcclient wkssvc_enumerateusers (cherry picked from commit d8c52227224771cbe55a469eec7530f91dc18e26)
       via  ca5bea4... s3: Complete support for NetWkstaGetInfo/NetWkstaEnumUsers (cherry picked from commit 381cf92adb3710d350e39f4a5cd72265a67e3b0a)
       via  bb33dd4... s3: First cut at _wkssvc_NetWkstaEnumUsers
       via  707be58... s3: Support NetWkstaGetInfo 101 and 102 (cherry picked from commit 7ead9dd7e8eece7b09d33fdc2ed0f83da0b41e7d)
       via  f34b40a... packaging(RHEL-CTDB): package dbwrap_tool and dbwrap_torture in the common pkg
       via  e546633... s3:dbwrap_ctdb: increase the number of commit retries 5-->100
       via  4167bbc... s3:dbwrap_ctdb: increase the rsn of the __transaction_lock__ when storing
       via  72c15dd... s3: Fix explicit stat64 support (cherry picked from commit c81f6e519e1f976fce0896fa7b9e29c412411e13)
       via  b61aa79... Make Samba3 pass the RAW-LOCK test as Windows.
       via  dfd505b... s3: bug #6967: Prevent glibc error on net ads join:  talloc()ed memory should not be SAFE_FREE()ed.
       via  728c756... s3 aclocal.m4: Fix iconv checks, clean up m4 code
       via  a1e5f3f... Make sure we're not using the old smb_fname data.
       via  b8fb8a7... Remove smb_fname duplicates that just keep the same information as in fsp->fsp_name.
       via  b3c4336... Refactor reply_rmdir to use handle based code. All calls are now handle based. Put rmdir into close.c and make it private. Jeremy. (cherry picked from commit 91e0bdd86c9c14f6b9b190db8ce6ec162ce79692) (cherry picked from commit b9e71c705242a02fc70bbe8db7b88fdd76179663)
       via  2921cbc... Ñ•3: remove superfluous option check
       via  842d076... s3: Fix crash in winbindd;(bug#6879).
       via  94cf480... Remove unneeded argument from can_set_delete_on_close(). Ensure can_set_delete_on_close() is correctly called before any setting of the disposition bit (clean up the do_unlink() call). Jeremy. (cherry picked from commit dfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6) (cherry picked from commit baa4727b243ff2dfb78d3dd5fd29c8e9a3667c56)
       via  723325e... s3-selftest: run LOCAL-NDR when running make selftest.
       via  8842ae8... s4-smbtorture: be very strict in checking spools_EnumPrinterKey results.
       via  45df060... spoolss: hand-marshall the spoolss_StringArray2 struct for spoolss_EnumPrinterKey.
       via  cfd6bec... samba-spoolss: use spoolss_StringArray2 in spoolss_EnumPrinterKey.
       via  ad0be56... spoolss: add spoolss_StringArray2.
       via  70091fb... s3-spoolss: move MAXDEVICENAME to spoolss idl.
       via  f7094cb... s3:build: remove redundant qnx block size definition (cherry picked from commit 4fa4e6738074d39d73acc82e04ee88c00529f6c3)
       via  6955103... Restructure the ACL code some more, get the internal semantics right. The previous bugs were due to the fact that get_nt_acl_internal() could return an NTSTATUS error if there was no stored ACL blob, but otherwise would return the underlying ACL from the filysystem. Fix this so it always returns a valid acl if it can, and if it does not its an error to be reported back to the client. This then changes the inherit acl code. Previously we were trying to match Windows by setting a minimal ACL on a new file that didn't inherit anything from a parent directory. This is silly - the returned ACL wouldn't match the underlying UNIX permissions. The current code will correctly inherit from a parent if a parent has any inheritable ACE entries that apply to the new object, but will return a mapping from the underlying UNIX permissions if the parent has no inheritable entries. This makes much more sense for new files/directories. Jeremy. (cherry picked from commit 3
 65c6b4ce0bd84bfb1d9cec03bc835b92b1c5af7) (cherry picked from commit 3e1afbbae79ee23c6f3b701ae3bcb57156049787)
       via  c064b08... s3: prefer posix_fallocate for doing "strict allocate"
       via  a227d4b... s3:build: fix shared library build on QNX
       via  52e1a60... Ensure check_parent_acl_common() only looks at stored blobs - returns NT_STATUS_OK if there aren't any. Jeremy. (cherry picked from commit 148e79d156d92b41dfe7d6ae6f8cd2e571a3bee6) (cherry picked from commit e0904e28f43e4fc3404df85967d088b9b8b8c7d2)
       via  1f1c6c9... Ensure get_nt_acl_internal() only looks at the ACL blobs, not reads off the underlying filesystem. Ensure that vfs_acl_tdb.c returns NT_STATUS_NOT_FOUND, not NT_STATUS_OBJECT_NAME_NOT_FOUND when it can't find a blob matching the file. Jeremy. (cherry picked from commit 486c8d57ec5a9aa63aff275621ff45c22b8cde61) (cherry picked from commit f01a14846f1ab1a5589cd780aa1c6ad45d73eccf)
       via  f7796d5... Fix bug #6837 - "Too many open files" when trying to access large number of files from Windows 7. Original patch by me fixed up with the correct open files number by jmaggard10 at hotmail.com. Jeremy. (cherry picked from commit b6fdecd11210a3d2ff803bdc315aacd9f8b445a1) (cherry picked from commit 358cca77b2e09262e7e7bd41a782f46cff63922c)
       via  a93b08c... Ensure we don't see the xattr used to store NT security (visible when xattr_tdb is used). Allows make test to pass with acl_xattr.so prepended to the vfs modules. Jeremy. (cherry picked from commit 8dda4cea660639190c1c7e84355186d07a6e064f) (cherry picked from commit d09fd7e6039fad1ec2c7e1a3730ef304eab308d5)
       via  8561054... s3: Fix smbd to correctly return INVALID_LEVEL on set_file_end_of_file_info for paths
       via  6a8fe8f... s3:build: fix detection of CTDB headers on systems without system-libtalloc
       via  ed7606b... s3:build: fix the build when no external talloc and tdb are installed.
       via  a205d74... correct mail address (cherry picked from commit e1f19bc357e9df2f61c19d6f260433c91bf01665)
       via  79418d8... Conditional install of the cifs.upcall man page
       via  309d76c... Adjust regex to match variable names including underscores
       via  112d3ce... Fix DEBUG 0 -> DEBUG 10 (left over code). Fix opendir status return if access denied. Jeremy. (cherry picked from commit 48f40793ae4190ebc9eec83924aeda9e3f16bf0d) (cherry picked from commit 8e77a754190dfdece3b4786eaee97eab96a97c1e)
       via  7a174eb... Fix bug 6938 : No hook exists to check creation rights when using acl_xattr module Fix ACL modules to test for permissions on open/mkdir/opendir. Ensure that underlying ACLs are returned for directories/files with no Windows xattr or tdb acls stored. Jeremy. (cherry picked from commit bdc8c9d37ca478f74127628ab03bb68cd72bff63) (cherry picked from commit 70c4293644b623e031dc4e086c52c929faab00a9)
       via  5c68d2c... drsuapi: fix build warning of NDR size calculation of drsuapi_DsReplicaObjectIdentifier3Binary.
       via  ca2ae87... s3-spoolss: fix fstrings in convert_devicemode() function.
       via  68ab060... Restructure the connect function code to always call down to NEXT-> before initializing. This allows us to do cleanup (by calling DISCONNECT) if initialization fails. Also fix vfs_acl_xattr which was failing to call the NEXT connect function. Jeremy. (cherry picked from commit 8303bc49a45d5bab0cdbd4f2d793088f600f715f) (cherry picked from commit 756b5032032c58815a227fdfd27140373d8ebc8c)
       via  11bd972... Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes from fgets (cherry picked from commit c0282f8f7d40b893610fdc235cb130f1fedbeb13)
       via  d0cac2d... Revert "s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6."
       via  89f14c6... Revert "s3: Fix crash in free_file_list()."
       via  34a3131... s3:docs: Fix typo in man mount.cifs.
       via  9d04d48... s3:docs: Document "aio write behind".
       via  59d3603... s3:docs: Document "ldap page size".
       via  08bc7de... s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
       via  1d1c3ba... s4-smbtorture: more and stricter tests for printer and data keys in RPC-SPOOLSS.
       via  db37074... s3-kerberos: fix the build on Mac OS X 10.6.2.
       via  0e88ac6... s3-kerberos: add a missing reference to authdata headers.
       via  a6aac7e... s3-kerberos: do not include authdata headers before including krb5 headers.
       via  7e92c20... s3-spoolss: simplify _spoolss_EnumPrinterKey a little more.
       via  88c4d8e... s3-kerberos: only use krb5 headers where required.
       via  d290e04... misc: mark winreg_Data little-endian except for a REG_DWORD_BIG_ENDIAN.
       via  df61f74... pidl: fix handling of output arguments in s3 client stubs.
       via  5bac875... s3-nsstest: drastically shrink size and dependencies of nsstest binary.
       via  dfefa5b... s3-kerberos: Fix Bug #6929: build with recent heimdal.
       via  a713d9e... s3-spoolss: use macros to fillup driver levels.
       via  f7a190b... s3: Fix crash in free_file_list().
       via  2a9dd5c... s3:docs: Document "enable core files".
       via  f70a778... s3:docs: Document "cache directory" and "state directory".
       via  e2beb9d... s3: Fix bug 6288 (cherry picked from commit 9038c6f1a0779d59cd8f9125118b975071c8e68b)
       via  037aa80... s3: Fix an uninitialized variable reference (cherry picked from commit dde5ac90361834aa8f01974ec0d7dbf063a4e0b6)
       via  1041e47... s3: Restore "fake directory create times" as a share parameter (cherry picked from commit bd652cce8f38f33b1f36cec4099c61adf67d7dbf)
       via  1c2dad7... s3: "copy_reg" only looks at mode, uid, gid, atime and mtime (no birthtime) (cherry picked from commit 0d03ddd2aba7d65055e07becc4461c7e5ea4babb)
       via  cb96e25... s3: Pass up fake_dir_create_times from atalk_build_paths
       via  2a217f1... s3: Move directory_exist_stat to testparm.c, it only looks at the mode (cherry picked from commit f216509a4004cc3d7920e9ef25160222166299a6)
       via  1371dbf... s3: Pass fake_dir_create_times down to file_exist_stat, none of the callers look at the mtime (cherry picked from commit 6d432d4db84427345c03438eb656b3f387288988)
       via  abada5d... s3: "startsmbfilepwent" only looks at the inode -- is that enough? (cherry picked from commit 70b754a838e5ddc025d4e6a65c08cb61596261b8)
       via  dfaad88... s3: "get_file_size" only looks at the size (cherry picked from commit dd82e9d503a1547aaef8ef600cb6224440234c1d)
       via  420806e... s3: "socket_exist" only looks at the mode (cherry picked from commit 581a33494ae98282238d069c2874a0a46c3624be)
       via  8fc567b... s3: "sys_path_to_bdev" only looks at the devicenumber (cherry picked from commit 8a79bc673c5ee980a2389f47e32306848989af2a)
       via  f1e9e0a... s3: "check_log_size" only looks at the size (cherry picked from commit c7f1c6220219fbc66561910ce286eb5dfdb90b06)
       via  92d7539... s3: "regf_hbin_allocate" only looks at the size (cherry picked from commit 37f1a0933a4a6b1ff3462ea802c49b765f3f6126)
       via  57bb5f2... s3: "read_block" only looks at the size (cherry picked from commit 7e0f61066f44ba9e44720d27f53de57d5265dc45)
       via  058fce0... s3: "write_block" does not use the sbuf at all (cherry picked from commit 72a7a1dc9c760580cb222692724e949d423cc82e)
       via  9b3fda8... s3: "net_conf_addshare" only looks at the mode (cherry picked from commit 04435d7439270f6abac1803aac066543925b3538)
       via  e25b699... s3: "net_usershare_add" only looks at the mode, device and inode (cherry picked from commit 4cc0045a4ea748299da892ce21283b9ec864053d)
       via  65f8b6f... s3: "net_usershare_add" only looks at the device and inode (cherry picked from commit 50a3344ac87669de665d5ac7a5a9ad63d14f7e38)
       via  c31115c... s3: "net_usershare_add" only looks at the mode and uid (cherry picked from commit ad2be463bc386128075331b3695655c997e7aea7)
       via  fd90d7d... s3: "count_num_usershares" only looks at the mode (cherry picked from commit d51a8d2717c9cd83b530a5d75893bba90c044e84)
       via  7532312... s3: "info_fn" only looks at the mode and uid (cherry picked from commit 1a38e0fa633e273d17e876926601ce2a3f3f1bb8)
       via  01af5fd... s3: "get_share_list" only looks at the mode and uid (cherry picked from commit 2db05665032f927698adadedebb21eb83289140d)
       via  459b9a5... s3: "cgi_download" only looks at the mode and size (cherry picked from commit 0b8810b80cf9532099851aa0b0989ed107c82454)
       via  d0a7a96... s3: "print_job_end" only looks at the size (cherry picked from commit 5bf61870ef1c982ba5454ee887646aa3cedb32e2)
       via  3084b0c... s3: "check_magic" only looks at the size (cherry picked from commit fb87f93adf71a26ff62469c528a8495143a7ab42)
       via  4d624ca... s3: "disk_quotas" only looks at the devicenumber (cherry picked from commit 0c812dcd2da29ebbd876649def1320e959b5f350)
       via  66a3c81... s3: "load_usershare_shares" only looks at the mode and uid (cherry picked from commit f93be990f571cfd0a44c0eef88d29138c68d4907)
       via  6cbe097... s3: "load_usershare_service" only looks at the mode and uid (cherry picked from commit 026befc823b672d3c94af1354c3d817f6ab0ed74)
       via  de917b2... s3: "usershare_exists" only looks at the mode and mtime (cherry picked from commit f1d180da90b4d7e5cd068360054a77dfc3836921)
       via  b40c77e... s3: "process_usershare_file" only looks at the dev, ino, mode and size (cherry picked from commit 437681d00fb9f67f3bb5c959b4106af7ba069eeb)
       via  427e3e2... s3: "process_usershare_file" only looks at the mode and size (cherry picked from commit c8241653f9255372137561e8231384d12eb417f4)
       via  df3e4ad... s3: "parse_usershare_file" only looks at the mode and uid (cherry picked from commit 5bb28252d9bfab6ddc25cf4d97d48398a7e08e8f)
       via  7751051... s3: "tar_parseargs" only looks at the mtime (cherry picked from commit 7c3d16a603163d4231cbff708b4e8088d071b40a)
       via  de664d4... s3: "dotareof" only looks at the file type (cherry picked from commit 34782bbf586c7c554812bcac2573d6db8453b560)
       via  8d0fac6... s3: client "newer" does not look at the create timestamp (cherry picked from commit b6e23d526291ec85d5e6ea9fbaf8b8113148931e)
       via  6a9e870... s3: Pass the "fake dir create times" parameter to sys_*stat
       via  adaed83... s3-smbd: no drsuapi server stubs yet in s3. Fixes the build, sorry.
       via  6f0d6bd... s3-rpc: running minimal_includes.pl on rpc_client and rpc_server.
       via  43fba1b... s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba.
       via  8b51fc9... s3-passdb: move some defines out of rpc headers (they really belong to passdb).
       via  949c999... s3-winbind: properly include netlogon.idl in wbint.idl.
       via  ada27ca... s3-spoolss: pre cosmetics: reorder levels in construct_printer_info levels.
       via  8ab32fb... s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.
       via  856b759... s4-smbtorture: refactor RPC-SAMR-LARGE-DC test a little more.
       via  52a2e9d... s4-smbtorture: add torture_samr_context to carry some RPC-SAMR-X specifics.
       via  45a77e5... tevent: Fix a comment (cherry picked from commit dbef8410476bc1eaa8bd68f8996da97782e5b13f)
      from  85d12a8... WHATSNEW: Start 3.5.0pre2 release notes.

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


- Log -----------------------------------------------------------------
commit 352adf37d2fcf3997544b3e079c79689befc7d2a
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Dec 8 10:54:26 2009 +0100

    WHATSNEW: Add changes since 3.5.0pre1.
    
    Karolin
    (cherry picked from commit a2c4f88b3e4329bf82f3236b0972babfe8df4532)

commit 540008bb372b3f69b98ea8bbbc19bd881dc214c3
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Dec 4 23:26:47 2009 +0100

    s3: check if glibc has broken posix_fallocate
    (cherry picked from commit 5062e190ed27e16145d9275533b6dd5bcb10209e)

commit 68c70feee89e8100e12f89010eeed7189045eee6
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 7 14:27:28 2009 +0100

    packaging(RHEL-CTDB): clean some commented out lines from the files sections
    
    Michael
    (cherry picked from commit a18692ddcffbe3faf1abc50091c9481e53e8c801)

commit 43edc9f43490f19e1f706669f12904881e49798e
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 7 14:26:03 2009 +0100

    packaging(RHEL-CTDB): explicitly list library versions in samba-winbind-32bit
    
    Michael
    (cherry picked from commit 0cc9a21c6f352765c1a3760d5f8eebd4dc6f8b8e)

commit 48fd5178ad39ab1239486fd20545cbbe0e034129
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 7 14:25:32 2009 +0100

    packaging(RHEL-CTDB): explicitly list library versions in samba-common
    
    Michael
    (cherry picked from commit a135a15a2bb5c56089715b842754c34b3ba9d55e)

commit de820ff347ba97b52d0d4a6b6fe769261cf3e086
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 7 14:20:24 2009 +0100

    packaging(RHEL-CTDB): explicitly list all packaged idmap/nss-info/charset modules
    
    in the samba-common package.
    This is to  better be able to catch regressions or
    build problems.
    
    Michael
    (cherry picked from commit ae0e6ab4c7bfd1547f0b0252a66523b9ab47f9c7)

commit d887667ec2b428e1c36b2652db33269b7ba65d39
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 7 14:16:15 2009 +0100

    packaging(RHEL-CTDB): explicitly list all the vfs modules in the main package
    
    Instead of the wildcard list, to better control regressions or
    build problems.
    
    Michael
    (cherry picked from commit d420b308c1640d96fd9d2b8fe2b4b8ac5071b38d)

commit 3d9b08ce23fcd84835811207be03fc32c608af3d
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 7 14:12:05 2009 +0100

    packaging(RHEL-CTDB): add some checks to test the built smbd
    
    Test whether some required features have been built into smbd.
    Can be extended...
    
    Michael
    (cherry picked from commit c6435cd8b36320b27a2a9940380daa776536e3e6)

commit 93af3abc86add38184883fe0e738c2de675a1450
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 7 14:11:32 2009 +0100

    packaging(RHEL-CTDB): make everything instead of all in the build stage
    
    Michael
    (cherry picked from commit 1aec01077944b6a2762624895bac42333ca36963)

commit a8190d19aaf60f83f7b2c6d142f09b5fe2e872dd
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Dec 7 14:41:09 2009 -0800

    parent_sd can never be null in this function, so don't
    check for it.
    
    Jeremy.
    (cherry picked from commit a24631007ea4dcf25e777070d783608f988a5f94)
    (cherry picked from commit eea09855f381d435b76298069b67e2d331b41f8c)

commit 5f3724d3a83b44d3d568997e363aa81593c9de37
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Dec 7 14:36:12 2009 -0800

    Hopefullt final fix for 6802 - acl_xattr.c module: A created folder does not properly inherit permissions from parent and 6938 - No hook exists to check creation rights when using acl_xattr module
    
    Volker was right (dammit :-). It's much easier to catch
    this case in the create_file() vfs call instead of trying
    to do everything inside open() and mkdir(). Hook all these
    functions to gain the desired effect.
    Jeremy.
    (cherry picked from commit 12bac42a93cd6afd3cd29460b97bbd61852a9d44)
    (cherry picked from commit aab1e424db3134db2d78553d51859dc79d1a8831)

commit 850b3755654efeef9f32c6415c4c176d88cd7a9a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Dec 4 16:46:34 2009 +0100

    s3: let gencache_init() use tdb_check()
    
    If the check fails we try to clear the tdb and start
    with an empty cache.
    
    metze
    (cherry picked from commit 909cd2617fa1c170183664af1fc4253af2dc2f21)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 1a17c8ffe0f17138e45b57a82d5b4a3c73628bca)

commit 05927ff692edbac6b35dda175f702b72a38def8b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Dec 4 16:34:08 2009 +0100

    s3: let netsamlogon_cache_init() use tdb_check()
    
    If the check fails we try to unlink the old file and
    start with an empty cache.
    
    metze
    (cherry picked from commit 8f19c08072a7a6036d59cf6c2ca6ce17c74b7635)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 8f737c3cd154f394f821b0e34ced3f84ff8773c4)

commit 830f18c5f4fc85a1dc49198365ed6ed7061e5dee
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Dec 4 16:32:42 2009 +0100

    s3: let tdb_validate_child() use tdb_check()
    
    metze
    (cherry picked from commit 6f6608c2aa6122c87ea1e8a937708d08e6c5785e)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 66847adf072606e6519a1de1ede3aa26d9e041ba)

commit 1af7a630ba070b39b3d0ba128ecefb9ce22527f8
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Dec 4 16:59:39 2009 +0100

    s3: require tdb 1.1.7 with tdb_check()
    
    metze
    (cherry picked from commit 886fe5b92082c2d18f97ff0bdcced52d38f344ca)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 7a16b95703bf063b2c02133c97a06f7ab0e85963)

commit 0cc88026949b721a3b5a98a21ea489c61e0088b1
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Dec 7 16:28:30 2009 +0100

    s3:docs: Document "directory name cache size".
    
    Karolin
    (cherry picked from commit 5055ba140d03189a3c8181d57ad920e68c6e387c)
    (cherry picked from commit a9077c77b7119fb15cbc74d9b160a363932b0bde)

commit 27ba4afe8c91bef238afd41f29ee0c8b9dc683da
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 7 16:24:08 2009 +0100

    s3: de-deprecate "write cache size" to prevent its removal without a proper alternative
    (cherry picked from commit 950857f6ba7f0ff4e238b600fc0e6c10c972e582)

commit b3267712f89f2f4c7a57f4ca9e89cbf0b897d152
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Dec 7 16:06:29 2009 +0100

    create-tarball: Readd RFCs (fixes the merged build).
    
    See http://lists.samba.org/archive/samba-technical/2009-December/068235.html
    for more information.
    
    Karolin
    (cherry picked from commit 08b692828ed6a9929dc6098fabc8aa47a0e32f93)

commit d65264f787e889ece1f1b720ed27f71acf031a9c
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 7 14:38:24 2009 +0100

    s4-smbtorture: disable some spoolss printerdata tests which s3 does not pass at the moment.
    
    Guenther
    (cherry picked from commit 8de6f7178c220d0a529ed91f87760e8d172448d2)
    (cherry picked from commit 5dde3686d951db49ae6a06a31dc43fd5c0d3162f)

commit 77379dc3a30c4d259571abbeb8f593a01d4c3480
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 7 11:54:26 2009 +0100

    s3: fix net and rpcclient after setprinterdataex changes.
    
    Guenther
    (cherry picked from commit c85ed0054e67413ffcd169c405ee4feda3555628)
    (cherry picked from commit 3f3c04e963d5532340b306ea4e875df2b03985d4)

commit 2ce37d09ac19bc0101a218d3cb791c34959c4345
Author: Günther Deschner <gd at samba.org>
Date:   Sat Dec 5 00:58:45 2009 +0100

    s4-smbtorture: fix RPC-SPOOLSS after _spoolss_SetPrinterDataEx IDL change.
    
    Guenther
    (cherry picked from commit 123d8d1c2c8ea214fa1a216c92ca1a3fc1b4d6d0)
    (cherry picked from commit f67637b63dce30b07fc95bd80ace36c9defbbb23)

commit 6f30f47c35b0b05822723611abb81697445b8291
Author: Günther Deschner <gd at samba.org>
Date:   Mon Dec 7 11:28:56 2009 +0100

    s3-spoolss: let _spoolss_DeletePrinterData call into _spoolss_DeletePrinterDataEx.
    
    Guenther
    (cherry picked from commit ef9d6580efc55ee040458b7cd76ebdc2e1276e98)
    (cherry picked from commit 50df20e01590533dbd086393ddf95835db2b71ac)

commit 26fe7c57daa9218f41ccaa831c59aa53f96fccb7
Author: Günther Deschner <gd at samba.org>
Date:   Sat Dec 5 00:56:55 2009 +0100

    s3-spoolss: let _spoolss_SetPrinterData call into _spoolss_SetPrinterDataEx.
    
    Guenther
    (cherry picked from commit 167dca0cbf18baf40dd923f6f92421123d34b5a3)
    (cherry picked from commit a987a9f33a9acba97764d1b43c106727ff653da3)

commit 0db6d1b5f57cd1952d2eb2639cbf0a89dc7baaae
Author: Günther Deschner <gd at samba.org>
Date:   Sat Dec 5 00:52:28 2009 +0100

    s3-spoolss: let _spoolss_GetPrinterData call into _spoolss_GetPrinterDataEx.
    
    Guenther
    (cherry picked from commit 778124ea32ecc9d2404ef6abd8af9d14e6320f3a)
    (cherry picked from commit 41232506678c06b64f193a0fae76b2bca862bd3f)

commit e6682d5cb0b16b9f41dd8d6d9e5c6311392f389c
Author: Günther Deschner <gd at samba.org>
Date:   Sat Dec 5 00:50:18 2009 +0100

    spoolss: rework spoolss_GetPrinterDataEx and spoolss_SetPrinterDataEx.
    
    Guenther
    (cherry picked from commit 08823166a13d5ec3027b0c5a0db5e684b8e3c3b6)
    (cherry picked from commit b35133dcc618e169045e078c53873bf0694f74f0)

commit f25145328ee44440b6e1f4667e26dcade4e65415
Author: Günther Deschner <gd at samba.org>
Date:   Fri Dec 4 17:22:25 2009 +0100

    s3-spoolss: a default printer should have at least a "PrintDriverData" key.
    
    Guenther
    (cherry picked from commit a367b2b5df30b92ccacc4fc15c07c1fd955c7d5b)
    (cherry picked from commit 8af757fe7c95ffba02d00d010fa5360943724574)

commit 945623fb8dac01163ba52e958a602508f13b4ac9
Author: Günther Deschner <gd at samba.org>
Date:   Fri Dec 4 13:33:49 2009 +0100

    s3-winreg: fill in some inline comments.
    
    Guenther
    (cherry picked from commit 1bc83b984d6f074a5a7c7d3e7f6de4a2278fee4c)
    (cherry picked from commit 7c646c39d7b05fa3c98edf012bca0e8057e70d57)

commit 3d952e3972d23790181eec2f29ff065710079983
Author: Günther Deschner <gd at samba.org>
Date:   Fri Dec 4 13:29:08 2009 +0100

    s3-winreg: remove trailing whitespace.
    
    Guenther
    (cherry picked from commit 5d46530053fa7728d1d4903a3d92f238202ab0d8)
    (cherry picked from commit d9717f661ed06e833ba895831f59424476ed4831)

commit f6512c438b46210339db510d878d00f71be2617f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Dec 4 02:54:33 2009 +0100

    s4-smbtorture: heavily expand printerdata tests in RPC-SPOOLSS.
    
    Including new tests for:
    - spoolss_SetPrinterDataEx
    - spoolss_DeletePrinterDataEx
    - spoolss_DeletePrinterKey
    
    Guenther
    (cherry picked from commit 02fe8630395879ffa761d75c7d7b75fc7cda5e4c)
    (cherry picked from commit 32bec5e5f09eec603b4fc366707bbd320dc804a3)

commit e315e45cbd98f95aabde21952beb88541c4a7b03
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 3 23:23:36 2009 +0100

    s3-spoolss: handle SEC_FLAG_MAXIMUM_ALLOWED in spoolss_OpenPrinterEx.
    
    In case someone (smbtorture4) requests SEC_FLAG_MAXIMUM_ALLOWED, translate it
    to a request of PRINTER_ACCESS_ADMINISTER.
    
    Guenther
    (cherry picked from commit 459a968fb4d6f96ea7f310f331d3547e2e466d6a)
    (cherry picked from commit e96c22d8d16a520c2ee9f49f71c26d1cb86f148f)

commit 6cfe8a2feb129966b938a4c82076b2d707e3c096
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 3 22:38:38 2009 +0100

    s4-smbtorture: check more WERRORs in RPC-SPOOLSS.
    
    Guenther
    (cherry picked from commit 2f0548fd98ccbe9695d4e6ae0e21e5ceca76ac68)
    (cherry picked from commit cfd570a0128db42429a48ab6001f20d99d8dbfeb)

commit df4c66cbc283702bd2396a22fdb7e98d966ca960
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 3 22:05:35 2009 +0100

    s4-smbtorture: call test_EnumPrinterDrivers with architecture in RPC-SPOOLSS.
    
    Guenther
    (cherry picked from commit 4e20a6f83b981ae0948ce1b9ec0a39162b38b512)
    (cherry picked from commit 3f0de03ca9d6e075e10943d9e511134231809b16)

commit aa0ad604c3399d719f91da6f853b5db0e64c653e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Dec 7 14:38:18 2009 +0100

    s3:auth: Fix typo in debug message.
    
    Karolin
    (cherry picked from commit 71018ebe5303ca6e0f3e3e4b96ae45fb32d3e195)
    (cherry picked from commit 626ae39f3952087e05cbcd42a049119860072bc8)

commit 1fb641e043eef53044e122d3b2f8c4ac92c6399e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Dec 7 10:15:49 2009 +0100

    examples: Fix the build of the example VFS modules.
    
    Karolin
    (cherry picked from commit fe01e0e1a5a07ddefdc09f24d44c7e66886405b8)
    (cherry picked from commit cef50766b3e622c12890811cd048ba4cec36bb96)

commit 91829a6edb9a9c15b3be696c1322b62210dd34f0
Author: Christian Ambach <christian.ambach at de.ibm.com>
Date:   Wed Dec 2 20:06:37 2009 +0100

    streamline some log levels for invalid servicenames
    
    I don't think we need to log the fact that a user gave a wrong sharename in Explorer with the highest log level.
    The level of this was not very consistent:
    service.c:		DEBUG(3,("find_service() failed to find service %s\n", service));
    service.c:		DEBUG(0,("%s (%s) couldn't find service %s\n",
    smb2_tcon.c:		DEBUG(1,("smbd_smb2_tree_connect: couldn't find service %s\n",
    
    This changes the last two to 3 as the first one.
    
    Signed-off-by: Christian Ambach <christian.ambach at de.ibm.com>
    (cherry picked from commit 1ae8145c66bcfc79ce5e554a057b410339868b8f)

commit c89ab0fbf40ed41034d9014b327ac135ff670a91
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Dec 6 12:50:51 2009 +0100

    s3: Fix a const discard warning
    (cherry picked from commit d8a40f1227132d49051ddbc2bb9727ee3956d86c)

commit ef41db684f3f38475f28ab42ca22dc3ee49bc729
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Dec 6 12:50:25 2009 +0100

    s3: talloc_array_length deals file with a NULL argument
    (cherry picked from commit 0249e477edee01ba4185db8ffada537e8bae8e79)

commit 9b89fa071067860a5b63307c42c4e0b54914cfea
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Dec 6 12:49:46 2009 +0100

    s3: Small simplification: qsort deals fine with just one entry
    (cherry picked from commit 3c5e571a2f1b6d32b735e26949b9739fc960c22b)

commit 384380c2f12503888101d367eb350f6a03cc45d1
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Dec 6 12:49:09 2009 +0100

    s3: Simplify usr_info_cmp by calling timeval_compare()
    (cherry picked from commit 4b3ad2547c452dd9493fe63e056346a5f7561a37)

commit d08914957c133a0c458f97d4cad091be958c04a1
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Dec 6 12:40:44 2009 +0100

    s3: Add rpcclient wkssvc_enumerateusers
    (cherry picked from commit d8c52227224771cbe55a469eec7530f91dc18e26)

commit ca5bea4b185bbc36dc94964a9cf6926fa08947da
Author: Ian Puleston <ipuleston at sonicwall.com>
Date:   Mon Nov 23 00:00:00 2009 +0100

    s3: Complete support for NetWkstaGetInfo/NetWkstaEnumUsers
    (cherry picked from commit 381cf92adb3710d350e39f4a5cd72265a67e3b0a)

commit bb33dd436e1797cf9cd0c756587fb0d7996af957
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Aug 3 17:27:11 2009 +0200

    s3: First cut at _wkssvc_NetWkstaEnumUsers
    
    This needs access checks!
    (cherry picked from commit 34fc32b9a71334217e4661525ed466d5d57642d2)

commit 707be588040247775cbb6dab36d8923d2eef86ba
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Aug 3 16:52:01 2009 +0200

    s3: Support NetWkstaGetInfo 101 and 102
    (cherry picked from commit 7ead9dd7e8eece7b09d33fdc2ed0f83da0b41e7d)

commit f34b40a5b91c5ef1d06ca822d5eb289e51810985
Author: Michael Adam <obnox at samba.org>
Date:   Fri Dec 4 23:29:22 2009 +0100

    packaging(RHEL-CTDB): package dbwrap_tool and dbwrap_torture in the common pkg
    
    Michael
    (cherry picked from commit ef33b60d1a22d7200c3047ca817cd78f3f9dea07)

commit e54663380c3851a9c8897137529a8ea85b4c3077
Author: Michael Adam <obnox at samba.org>
Date:   Fri Dec 4 14:53:05 2009 +0100

    s3:dbwrap_ctdb: increase the number of commit retries 5-->100
    
    This is to cope with timeouts when recoveries and transactions collide.
    Maybe 100 is too hight, but 10 or even 20 have been too low in a
    very busy environment.
    
    Michael
    (cherry picked from commit 97eb53b432e8b16e55b0dccac7acbb2e40467dc6)

commit 4167bbcf03a35e3b21a30643933b13c7de49b750
Author: Michael Adam <obnox at samba.org>
Date:   Fri Dec 4 14:49:53 2009 +0100

    s3:dbwrap_ctdb: increase the rsn of the __transaction_lock__ when storing
    
    so that it is correctly handled by recoveries.
    Also set the dmaster explicitly.
    
    Michael
    (cherry picked from commit 8e4f774bff9926567006cdc263fa76fd8b703b63)

commit 72c15dd621806a34966847e89fcb0b0c55f2cfe8
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Dec 5 14:27:04 2009 +0100

    s3: Fix explicit stat64 support
    (cherry picked from commit c81f6e519e1f976fce0896fa7b9e29c412411e13)

commit b61aa791675cbbfceccf4f04f6ef033b13aa41ce
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 4 14:04:08 2009 -0800

    Make Samba3 pass the RAW-LOCK test as Windows.
    
    Implement the win7 NT_STATUS_INVALID_LOCK_RANGE.
    Make smbd behave as Windows does in canceling locks.
    
    Jeremy.
    (cherry picked from commit 32915ceefc718621e2e9b17fee97da82744ab67a)
    (cherry picked from commit 3ec654de706f4bd2576245333cc98105388a3c10)

commit dfd505b595c45beb01c04c18ab071f0fb1370471
Author: Jim McDonough <jmcd at samba.org>
Date:   Fri Dec 4 12:31:53 2009 -0500

    s3: bug #6967: Prevent glibc error on net ads join:
     talloc()ed memory should not be SAFE_FREE()ed.
    
    Signed-off-by: Jim McDonough <jmcd at samba.org>
    (cherry picked from commit 242d1179f92666e7548cb2f26695a0306e20d64c)

commit 728c756a734f8e01737bea97aa0f4f1103fcb6a2
Author: Kai Blin <kai at samba.org>
Date:   Fri Dec 4 09:47:25 2009 +0100

    s3 aclocal.m4: Fix iconv checks, clean up m4 code
    
    The check for iconv requiring giconv.h and libgiconv as well as
    the check for iconv requiring biconv.h and libbiconv were using the wrong
    variable to check for previous successful test results. This caused the checks
    to always fall back to libbiconv on systems where that library was available.
    
    In the course of fixing this, I had to clean up the indentation in that piece of
    code, and I also rewrote/added some comments.
    
    Many thanks to Tsurutani Naoki <turutani at scphys.kyoto-u.ac.jp> for the initial
    patch and diagnosis.
    (cherry picked from commit f5aff324cb9d965bbc75634596c3c40ffc588183)
    (cherry picked from commit 217a02b4a6432b1e232fe8dd0b022bc85ab47e56)

commit a1e5f3ffe30213072c6dc0bbfcab58cb82c9342c
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 3 17:44:38 2009 -0800

    Make sure we're not using the old smb_fname data.
    
    Jeremy.
    (cherry picked from commit 66c968778d74280bf36342e76c80b617e47ebde5)
    (cherry picked from commit d0aaff97a20adf6b4c8406f2a21d45018cf5b2cb)

commit b8fb8a75aefd68453402da6062c30becb20a7097
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 3 16:45:35 2009 -0800

    Remove smb_fname duplicates that just keep the same information as in fsp->fsp_name.
    
    Moving towards making VFS_OPEN/VFS_MKDIR/VFS_RMDIR
    handle based...
    Jeremy.
    (cherry picked from commit 3fe7dfd1d90374a2e06e1683b8f2c702c471c833)
    (cherry picked from commit cb1f641d2b9c758cc4dc8b4edb10f27543ae7a98)

commit b3c4336fd026edf2b717063b8beaa9422fc5bf86
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 3 13:01:10 2009 -0800

    Refactor reply_rmdir to use handle based code. All
    calls are now handle based. Put rmdir into close.c
    and make it private.
    Jeremy.
    (cherry picked from commit 91e0bdd86c9c14f6b9b190db8ce6ec162ce79692)
    (cherry picked from commit b9e71c705242a02fc70bbe8db7b88fdd76179663)

commit 2921cbcdb37d1b935a1c5e7f83c8795370a11ea5
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Dec 3 02:32:47 2009 +0100

    Ñ•3: remove superfluous option check
    
    this function is only called when strict alloc is set, no reason to check that twice.
    (cherry picked from commit f39f894ed45a3cfbbc73fe67364f18908e8260fe)

commit 842d0769668fb242a8fab541af65639a007a7405
Author: Bo Yang <boyang at samba.org>
Date:   Fri Dec 4 12:53:38 2009 +0800

    s3: Fix crash in winbindd;(bug#6879).
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    (cherry picked from commit cdb68bd2b61147df77b7f2de3fb4e29be07e7bd9)
    (cherry picked from commit 3c4f74bbcbe7c9c7e50865adac2db70e48a2d82f)

commit 94cf480096be8d5210e16bd26418de4d7d82a6db
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 2 18:06:40 2009 -0800

    Remove unneeded argument from can_set_delete_on_close(). Ensure
    can_set_delete_on_close() is correctly called before any setting
    of the disposition bit (clean up the do_unlink() call).
    Jeremy.
    (cherry picked from commit dfcc4115ddc7c3bf7a69d7eb747c096cd217b8a6)
    (cherry picked from commit baa4727b243ff2dfb78d3dd5fd29c8e9a3667c56)

commit 723325e66afc7aa6784e1ab5bf07c148acaceca9
Author: Günther Deschner <gd at samba.org>
Date:   Thu Dec 3 00:46:47 2009 +0100

    s3-selftest: run LOCAL-NDR when running make selftest.
    
    Guenther
    (cherry picked from commit 9a3d9abdd8e9737245e3cdd7f31d453c2062dba9)
    (cherry picked from commit bd99ed71ed29012bddb815169166d7165e6167a7)

commit 8842ae8afd398220b46d9d34b583e7ce094d4a78
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 2 23:38:05 2009 +0100

    s4-smbtorture: be very strict in checking spools_EnumPrinterKey results.
    
    Guenther
    (cherry picked from commit 450211b61016a4fed71eb116c1b526af0f365f13)
    (cherry picked from commit 6b8158ddfdce65e32ca39d8cc2c1d7b215cd22ff)

commit 45df0609f8bad804a957281869ae6bf28ed9ee3d
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 2 21:26:10 2009 +0100

    spoolss: hand-marshall the spoolss_StringArray2 struct for spoolss_EnumPrinterKey.
    
    This call is just driving me nuts :-)
    
    Guenther
    (cherry picked from commit f32ccc321a5467401781a0e2d4621175b6256368)
    (cherry picked from commit 0005a36b14808b67a4b97376b8305bd3145ea90a)

commit cfd6bec042faec6454a93b9a43232b75ed473566
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 2 14:25:31 2009 +0100

    samba-spoolss: use spoolss_StringArray2 in spoolss_EnumPrinterKey.
    
    This should finally resolve the endian issues we were seeing on sparc and is
    much cleaner for spoolss clients and servers.
    
    Guenther
    (cherry picked from commit 5f60855ba2eb822dcb867378ff09278c42931b89)
    (cherry picked from commit 91e9afbcd65500a37f947442955d9ca3e080982e)

commit ad0be569c4b4f81766e9c3c96acdbd111908c8e8
Author: Günther Deschner <gd at samba.org>
Date:   Wed Dec 2 14:22:52 2009 +0100

    spoolss: add spoolss_StringArray2.
    
    The difference to spoolss_StringArray is that in spoolss_StringArray2 the string
    array is put into a subcontext of _ndr_size.
    
    Guenther
    (cherry picked from commit 292af4fc046ff39ebd3ec853c402dc267a863fa6)
    (cherry picked from commit 46b5f055ffc8fbdf622482cca746e00dcfac9ca0)

commit 70091fbf3e417a8e6ea67a3de2d09827ad5d8a36
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 1 02:38:19 2009 +0100

    s3-spoolss: move MAXDEVICENAME to spoolss idl.
    
    Guenther
    (cherry picked from commit 91bb0659776d397bc4b8ca7a534f6f2327e2e6fe)
    (cherry picked from commit 31217f3edaf2565947d3e79f4d655503b013bd18)

commit f7094cb508de4a321e1c3825ebedacf595ea8349
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Dec 3 00:12:53 2009 +0100

    s3:build: remove redundant qnx block size definition
    (cherry picked from commit 4fa4e6738074d39d73acc82e04ee88c00529f6c3)

commit 6955103aaaee69b204886c2d34bdfdf16c46a29f
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 2 15:02:28 2009 -0800

    Restructure the ACL code some more, get the internal semantics
    right. The previous bugs were due to the fact that get_nt_acl_internal()
    could return an NTSTATUS error if there was no stored ACL blob, but
    otherwise would return the underlying ACL from the filysystem. Fix
    this so it always returns a valid acl if it can, and if it does not
    its an error to be reported back to the client. This then changes
    the inherit acl code. Previously we were trying to match Windows
    by setting a minimal ACL on a new file that didn't inherit anything
    from a parent directory. This is silly - the returned ACL wouldn't
    match the underlying UNIX permissions. The current code will correctly
    inherit from a parent if a parent has any inheritable ACE entries
    that apply to the new object, but will return a mapping from the
    underlying UNIX permissions if the parent has no inheritable entries.
    This makes much more sense for new files/directories.
    Jeremy.
    (cherry picked from commit 365c6b4ce0bd84bfb1d9cec03bc835b92b1c5af7)
    (cherry picked from commit 3e1afbbae79ee23c6f3b701ae3bcb57156049787)

commit c064b089109a2b8192d344a7faadbde9a2b0d194
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Dec 2 15:13:37 2009 +0100

    s3: prefer posix_fallocate for doing "strict allocate"
    
    posix_fallocate is more efficient than manual zero'ing the file. When
    preallocation in kernel space is supported it's extremely fast. Support for
    preallocation at fs layer via posix_fallocate and fallocate at kernel site
    can be found in Linux kernel 2.6.23/glibc 2.10 with ext4, XFS and OCFS2. Other
    systems that I know of which support fast preallocation in kernel space are
    AIX 6.1 with JFS2 and recent Solaris versions with ZFS maybe UFS2, too.
    
    People who have a system with preallocation in kernel space might want to set
    "strict allocate = yes". This reduces file fragentation and it's also safer for
    setups with quota being turned on.
    
    As of today most systems still don't have preallocation in kernel space, and
    that's why "strict allocate = no" will stay the default for now.
    (cherry picked from commit a1991b17cdb38b1bffa32d2386132ae01f827cd0)

commit a227d4b8d7f064606a9c656d31cfbc56eac98b63
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Dec 3 00:02:44 2009 +0100

    s3:build: fix shared library build on QNX
    
    Fixes #6860. Thanks to Matt Kraai!
    (cherry picked from commit 7d53a5f728430013c7daca5b1301dc9271c29680)

commit 52e1a601e877438888ade04fb1b125f4da96ae76
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 2 12:29:16 2009 -0800

    Ensure check_parent_acl_common() only looks at stored
    blobs - returns NT_STATUS_OK if there aren't any.
    Jeremy.
    (cherry picked from commit 148e79d156d92b41dfe7d6ae6f8cd2e571a3bee6)
    (cherry picked from commit e0904e28f43e4fc3404df85967d088b9b8b8c7d2)

commit 1f1c6c9ef51a524548464e0efe6091f0ae75dee3
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 2 12:09:48 2009 -0800

    Ensure get_nt_acl_internal() only looks at the ACL blobs, not
    reads off the underlying filesystem. Ensure that vfs_acl_tdb.c
    returns NT_STATUS_NOT_FOUND, not NT_STATUS_OBJECT_NAME_NOT_FOUND
    when it can't find a blob matching the file.
    Jeremy.
    (cherry picked from commit 486c8d57ec5a9aa63aff275621ff45c22b8cde61)
    (cherry picked from commit f01a14846f1ab1a5589cd780aa1c6ad45d73eccf)

commit f7796d501789c60f2475920e476f64d884962089
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 2 10:01:14 2009 -0800

    Fix bug #6837 - "Too many open files" when trying to access large number of files
    from Windows 7. Original patch by me fixed up with the correct open files number
    by jmaggard10 at hotmail.com.
    Jeremy.
    (cherry picked from commit b6fdecd11210a3d2ff803bdc315aacd9f8b445a1)
    (cherry picked from commit 358cca77b2e09262e7e7bd41a782f46cff63922c)

commit a93b08c07f1663ced9ee8bc9d811ebd17c41e17b
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 1 14:08:16 2009 -0800

    Ensure we don't see the xattr used to store NT security (visible when xattr_tdb
    is used). Allows make test to pass with acl_xattr.so prepended to the vfs modules.
    Jeremy.
    (cherry picked from commit 8dda4cea660639190c1c7e84355186d07a6e064f)
    (cherry picked from commit d09fd7e6039fad1ec2c7e1a3730ef304eab308d5)

commit 85610546b10f9472f39d1d5666b34c1082bd9b44
Author: Tim Prouty <tprouty at samba.org>
Date:   Tue Dec 1 10:47:08 2009 -0800

    s3: Fix smbd to correctly return INVALID_LEVEL on set_file_end_of_file_info for paths
    
    This allows smbd to pass the freshly updated RAW-SFILEINFO-END-OF-FILE
    torture test.
    (cherry picked from commit ae649782df6e22c8e1922aaa03c248e5af68a036)
    (cherry picked from commit 81e22afd9e4cb7b26cdb95b5dfdaf5dac877e147)

commit 6a8fe8f9ff3ee5e64be505142e596ce78999e6a7
Author: Michael Adam <obnox at samba.org>
Date:   Tue Dec 1 15:22:20 2009 +0100

    s3:build: fix detection of CTDB headers on systems without system-libtalloc
    
    Michael
    (cherry picked from commit 86de6647bb6f71cd43363b1be0a9f15a750024fc)

commit ed7606bdd3b461d4353bd6ef3b38c0f478688f12
Author: Michael Adam <obnox at samba.org>
Date:   Tue Dec 1 15:03:35 2009 +0100

    s3:build: fix the build when no external talloc and tdb are installed.
    
    The check for the external libs and the addition of the include paths
    to the CPPFLAGS was too late in configure.
    
    This patch moves the whole subsystem/library section up right below
    the detection of "BLDSHARED".
    And it updates not only SAMBA_CPPFLAGS but also SAMBA_CONFIGURE_CPPFLAGS
    so that many tests that use these flags can now succeed.
    
    Michael
    (cherry picked from commit 06618b55e3e9d17cb7802aeed4769166118af373)

commit a205d740e9d69c39601fa5e9d75d939d2ff17f52
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Dec 1 11:48:26 2009 +0100

    correct mail address
    (cherry picked from commit e1f19bc357e9df2f61c19d6f260433c91bf01665)

commit 79418d8208688c9f2d575c1d97e168decc04acdf
Author: Lars Müller <lars at samba.org>
Date:   Mon Feb 2 21:12:52 2009 +0100

    Conditional install of the cifs.upcall man page
    
    Only install the cifs.upcall man page if CIFSUPCALL_PROGS was set while
    configure.
    (cherry picked from commit 789963de23d46eba41cdd29c7b50100ec47e4361)
    
    Fix bug #6710 (cifs.upcall: Commits e9e2414e and 64982295 are missing in 3.4.1).
    (cherry picked from commit 57c99111408e38cb68a7d194bdfd31fc0864600d)

commit 309d76c9f2a9e11892994aa22f17cc51fc2635e3
Author: Lars Müller <lars at samba.org>
Date:   Mon Feb 2 21:38:38 2009 +0100

    Adjust regex to match variable names including underscores
    
    This is required to get the CIFSUPCALL_PROGS setting extracted from
    config.log.
    (cherry picked from commit 5148eefe1ea6e215dcbf4ffaa642860bd8dab45f)
    (cherry picked from commit 0b83d6a1d8dfffc0e9f95c67afbeb0d7125060a1)

commit 112d3ce7d21621092c1110d0efaee6a63c87a817
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 30 16:56:35 2009 -0800

    Fix DEBUG 0 -> DEBUG 10 (left over code).
    Fix opendir status return if access denied.
    Jeremy.
    (cherry picked from commit 48f40793ae4190ebc9eec83924aeda9e3f16bf0d)
    (cherry picked from commit 8e77a754190dfdece3b4786eaee97eab96a97c1e)

commit 7a174ebc65a5080e086ecc109915351abbe15636
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 30 16:50:34 2009 -0800

    Fix bug 6938 : No hook exists to check creation rights when using acl_xattr module
    Fix ACL modules to test for permissions on open/mkdir/opendir.
    Ensure that underlying ACLs are returned for directories/files with
    no Windows xattr or tdb acls stored.
    Jeremy.
    (cherry picked from commit bdc8c9d37ca478f74127628ab03bb68cd72bff63)
    (cherry picked from commit 70c4293644b623e031dc4e086c52c929faab00a9)

commit 5c68d2c4493bb8c460ffebc94568a9a54b69565a
Author: Günther Deschner <gd at samba.org>
Date:   Tue Dec 1 00:24:16 2009 +0100

    drsuapi: fix build warning of NDR size calculation of drsuapi_DsReplicaObjectIdentifier3Binary.
    
    The generated size actually does not include the size of the binary itself.
    
    Guenther
    (cherry picked from commit d3339cd0c6ffa490513cc4562d2c06c218c7967e)

commit ca2ae87e65c4169d43ae13718f8afe93d4f3789f
Author: Günther Deschner <gd at samba.org>
Date:   Mon Nov 30 18:10:59 2009 +0100

    s3-spoolss: fix fstrings in convert_devicemode() function.
    
    Guenther
    (cherry picked from commit 753b9c6d566fafee9724a84fbd91316767c1c7a2)
    (cherry picked from commit f5b13667385bbdaa0f75dd46864ad952f7a9bbfe)

commit 68ab0606bd7c495c458f7c716bcf6c8e7f616c3d
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Nov 30 15:53:04 2009 -0800

    Restructure the connect function code to always call
    down to NEXT-> before initializing. This allows us to
    do cleanup (by calling DISCONNECT) if initialization
    fails. Also fix vfs_acl_xattr which was failing to
    call the NEXT connect function.
    Jeremy.
    (cherry picked from commit 8303bc49a45d5bab0cdbd4f2d793088f600f715f)
    (cherry picked from commit 756b5032032c58815a227fdfd27140373d8ebc8c)

commit 11bd972d60964fc8442c15ed2530ff61cb443ccc
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Nov 30 21:48:33 2009 +0100

    Fix bug 6546: Avoid accessing buf[-1] if NUL byte comes from fgets
    (cherry picked from commit c0282f8f7d40b893610fdc235cb130f1fedbeb13)

commit d0cac2dc28fe344eca3f86a681ef5dbd290370ea
Author: Bo Yang <boyang at samba.org>
Date:   Tue Dec 1 01:05:35 2009 +0800

    Revert "s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6."
    
    This reverts commit 509b42486e5f98343d95100c12969703398a248d.
    (cherry picked from commit f9651fcd867293fb0364729e220ee81c3f7a72af)

commit 89f14c67d0e12a461df0fd40faec48ffda6873ec
Author: Bo Yang <boyang at samba.org>
Date:   Tue Dec 1 01:05:10 2009 +0800

    Revert "s3: Fix crash in free_file_list()."
    
    This reverts commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
    (cherry picked from commit cdbf7708c219f12432c8cac237dd9c1144b8ee22)

commit 34a31314c9da06dd9b5c7c21e89264a9db970b15
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Nov 30 14:53:23 2009 +0100

    s3:docs: Fix typo in man mount.cifs.
    
    Fix bug #6844 (wrong credential file format in mount.cifs manpage).
    Thanks to the Debian Samba package maintainers for reporting!
    
    Karolin
    (cherry picked from commit 3b7f8a759f57f32a8c1bc2db85236e88f616ffd9)
    (cherry picked from commit 54e2e0ae51e2e126696570104ed64d0458beb4ce)

commit 9d04d48c637ddf307285003aaf7295def24f7f9c
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Nov 30 13:34:34 2009 +0100

    s3:docs: Document "aio write behind".
    
    Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
    
    Karolin
    (cherry picked from commit fde7c2ab19bc7442d8ee9d85ab2fe54e0cfb4782)
    (cherry picked from commit 267ebc03b43dd8c11f5aebf341620b0d94d95135)

commit 59d3603fa5bc0fcd5cc54965bdc0e39dcfe3fa82
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Nov 30 12:29:27 2009 +0100

    s3:docs: Document "ldap page size".
    
    Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
    
    Karolin
    (cherry picked from commit 9478ec35b5349f50a61bbe2aa88af88577918e91)
    (cherry picked from commit 940121d666b9e0645584c93db178b763ac5c8c04)

commit 08bc7de4602157bb90f01a462842c011a2d393bd
Author: Bo Yang <boyang at samba.org>
Date:   Mon Nov 30 19:39:33 2009 +0800

    s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6.
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    (cherry picked from commit 509b42486e5f98343d95100c12969703398a248d)

commit 1d1c3ba740a8e84c84d6f1a6f4486379b13384cc
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 23:14:27 2009 +0100

    s4-smbtorture: more and stricter tests for printer and data keys in RPC-SPOOLSS.
    
    Guenther
    (cherry picked from commit 8f6df5d3ec31a8c3dedfdfc506c44e03026d8485)
    (cherry picked from commit e1468d0935140f99412dc92b32d38e64c21d6b75)

commit db3707446a9eacf393f1512f5868f0873807522c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 20:08:44 2009 +0100

    s3-kerberos: fix the build on Mac OS X 10.6.2.
    
    Guenther
    (cherry picked from commit 51328a7056918bc75a7c1c442f47cf0271075542)
    (cherry picked from commit 3788ac88eff1b8912916d9f5f288545741c26f11)

commit 0e88ac6bfe5f5d2ed4caa5eb9aeb1f35a3dfaa26
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 18:51:56 2009 +0100

    s3-kerberos: add a missing reference to authdata headers.
    
    Guenther
    (cherry picked from commit da79cbb0800dd647be864e8bbb5fe1132708174b)
    (cherry picked from commit 80da9b6fe45122f847bb3219779f4d4f59484398)

commit a6aac7e4797f43d944307410ca3f51f018e249e6
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 18:30:18 2009 +0100

    s3-kerberos: do not include authdata headers before including krb5 headers.
    
    Guenther
    (cherry picked from commit ae207370667a12db53362ee5dcdab8e6d4bb388f)
    (cherry picked from commit 15bc4a0a928a0b750e09be49455a831d607c449f)

commit 7e92c20c960f7e9758eb981e560a7dc9e8e384d9
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 19:01:54 2009 +0100

    s3-spoolss: simplify _spoolss_EnumPrinterKey a little more.
    
    Guenther
    (cherry picked from commit e512ccb5b677fa7f285829ec645fc067837c0e11)
    (cherry picked from commit 281e09887cbca031600b52850b31e04bfa758e6e)

commit 88c4d8e939b4447f4acd7fd976d466c30c5889f5
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 15:52:57 2009 +0100

    s3-kerberos: only use krb5 headers where required.
    
    This seems to be the only way to deal with mixed heimdal/MIT setups during
    merged build.
    
    Guenther
    (cherry picked from commit 04f8c229de7ffad5f4ec1a0bb68c2c8b4ccf4e15)
    (cherry picked from commit da926c1249705b95344730539c64111876955151)

commit d290e0491fc6b3aedaec3894ab6494620b674100
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 11:18:30 2009 +0100

    misc: mark winreg_Data little-endian except for a REG_DWORD_BIG_ENDIAN.
    
    Guenther
    (cherry picked from commit 23d77be6cb8847cbdad859269faf59fea30b27b8)
    (cherry picked from commit a6d3e0e7f20f393f1040cca57b3a0a5b91f064c1)

commit df61f748b2154c69d039358d9eeed42e4c0f6ef0
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 16:06:40 2009 +0100

    pidl: fix handling of output arguments in s3 client stubs.
    
    a20e095 used (uint8_t) instead of (uint8_t *).
    
    Guenther
    (cherry picked from commit 79f82998b1aa8349f76a4c82c17daf7e03cdb41a)
    (cherry picked from commit 8f1361e627aba9ef3f207cb9a38c4394bd55ccff)

commit 5bac8754233f2d25aac63f6c0121d170294145ba
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jun 25 18:18:50 2009 +0200

    s3-nsstest: drastically shrink size and dependencies of nsstest binary.
    
    The size went down from 6.4M to 104K on my box.
    
    Guenther
    (cherry picked from commit d6c60f8447ce92a15d48a35d3f21d881c4428663)
    (cherry picked from commit 2b7e84f217b523aec81f160740f63d50e4f00a05)

commit dfefa5b3ad85a50808216a06c8f9cd01ffd4d395
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 27 01:06:36 2009 +0100

    s3-kerberos: Fix Bug #6929: build with recent heimdal.
    
    Heimdal changed the KRB5_DEPRECATED define (which now may not take an identifier
    for activation) in new releases (like 1.3.1).
    
    Guenther
    (cherry picked from commit 1a8f8382740e352a83133b8c49aaedd4716210cd)
    (cherry picked from commit b22a7521f62c2ae0d4a8fca4c5b9985de7adee26)

commit a713d9e8f8dff4a34c9f5b2eff98529bb671361c
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 23:46:50 2009 +0100

    s3-spoolss: use macros to fillup driver levels.
    
    Guenther
    (cherry picked from commit 49e464cef5ed75976fcd6c544bffbd4391f3a1b6)
    (cherry picked from commit f0d52b55896fbb1802aa90fa5ec2b16438373ccf)

commit f7a190b5fd8f9530de05412ae700977cb4ae9439
Author: Bo Yang <boyang at samba.org>
Date:   Mon Nov 30 17:30:25 2009 +0800

    s3: Fix crash in free_file_list().
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    (cherry picked from commit 62a27325d99cf4371fe98d049110e585dd209c98)
    (cherry picked from commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6)

commit 2a9dd5c9717025da92bff0e824f0d51b3798a326
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Nov 30 11:40:06 2009 +0100

    s3:docs: Document "enable core files".
    
    Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
    
    Karolin
    (cherry picked from commit b03ad70848e6ea889f382c0cb9f21057370f1ab6)
    (cherry picked from commit 15f7b70b0e6b6bd2604255cff1c351bb0425e9f3)

commit f70a778d2e33c54b3d8b5c3bc3e054a6e997571a
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Nov 30 11:04:50 2009 +0100

    s3:docs: Document "cache directory" and "state directory".
    
    Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
    
    Karolin
    (cherry picked from commit 0003b5fad1dee687bc15dfad9f71b6dfc40556d7)
    (cherry picked from commit d677cea90f0b28d65ddba551acaed9157ea30c2e)

commit e2beb9dde8a7d0b0131a6700828b079f24d41012
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 29 23:31:45 2009 +0100

    s3: Fix bug 6288
    (cherry picked from commit 9038c6f1a0779d59cd8f9125118b975071c8e68b)

commit 037aa80e231f619a050fee07a81bd6f683b45323
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Nov 29 22:57:19 2009 +0100

    s3: Fix an uninitialized variable reference
    (cherry picked from commit dde5ac90361834aa8f01974ec0d7dbf063a4e0b6)

commit 1041e476a4e6d103d8a700af8a279380713619a1
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 15:44:50 2009 +0100

    s3: Restore "fake directory create times" as a share parameter
    (cherry picked from commit bd652cce8f38f33b1f36cec4099c61adf67d7dbf)

commit 1c2dad7b288b279fad9cb1bb9ddc07cdfe29cf0a
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 15:10:23 2009 +0100

    s3: "copy_reg" only looks at mode, uid, gid, atime and mtime (no birthtime)
    (cherry picked from commit 0d03ddd2aba7d65055e07becc4461c7e5ea4babb)

commit cb96e259e063b71997f01292973b90b032ffd774
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 14:58:46 2009 +0100

    s3: Pass up fake_dir_create_times from atalk_build_paths
    
    The callers only look at the mode
    (cherry picked from commit 5bb20f3e6f76614f3fba0eaa757a563e59fa5916)

commit 2a217f10a2f0e7e5c43db697b66cae50ee96c91b
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:19:30 2009 +0100

    s3: Move directory_exist_stat to testparm.c, it only looks at the mode
    (cherry picked from commit f216509a4004cc3d7920e9ef25160222166299a6)

commit 1371dbf388cec245c942ef7a6fb9d5354252736a
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:17:05 2009 +0100

    s3: Pass fake_dir_create_times down to file_exist_stat, none of the callers look at the mtime
    (cherry picked from commit 6d432d4db84427345c03438eb656b3f387288988)

commit abada5d6be467da4da52176c9a734e28bc8c644f
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:12:40 2009 +0100

    s3: "startsmbfilepwent" only looks at the inode -- is that enough?
    (cherry picked from commit 70b754a838e5ddc025d4e6a65c08cb61596261b8)

commit dfaad88d9e60f62db9fabe425615c32f491b37b8
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:11:17 2009 +0100

    s3: "get_file_size" only looks at the size
    (cherry picked from commit dd82e9d503a1547aaef8ef600cb6224440234c1d)

commit 420806e2920cf47b718f84040351fd3c72356caf
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:10:48 2009 +0100

    s3: "socket_exist" only looks at the mode
    (cherry picked from commit 581a33494ae98282238d069c2874a0a46c3624be)

commit 8fc567bb97a8515ca43f9ca079259505a852ac1f
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:08:51 2009 +0100

    s3: "sys_path_to_bdev" only looks at the devicenumber
    (cherry picked from commit 8a79bc673c5ee980a2389f47e32306848989af2a)

commit f1e9e0a81a70bae664122611e6a5104d15c550ab
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:07:54 2009 +0100

    s3: "check_log_size" only looks at the size
    (cherry picked from commit c7f1c6220219fbc66561910ce286eb5dfdb90b06)

commit 92d75392126a72d2c5b85d6a6d822615d8a4c1ae
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:07:12 2009 +0100

    s3: "regf_hbin_allocate" only looks at the size
    (cherry picked from commit 37f1a0933a4a6b1ff3462ea802c49b765f3f6126)

commit 57bb5f2302a4fbbe26e557b82b35b05c2c15ed26
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:06:44 2009 +0100

    s3: "read_block" only looks at the size
    (cherry picked from commit 7e0f61066f44ba9e44720d27f53de57d5265dc45)

commit 058fce0cc7a74f2b4eab949599b1e5dc2fd1b624
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:06:14 2009 +0100

    s3: "write_block" does not use the sbuf at all
    (cherry picked from commit 72a7a1dc9c760580cb222692724e949d423cc82e)

commit 9b3fda8ee50251d37317983dc9e202a8807cf901
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:05:16 2009 +0100

    s3: "net_conf_addshare" only looks at the mode
    (cherry picked from commit 04435d7439270f6abac1803aac066543925b3538)

commit e25b699c153cceed9cf900f2ec9440ae946e5ccb
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:04:38 2009 +0100

    s3: "net_usershare_add" only looks at the mode, device and inode
    (cherry picked from commit 4cc0045a4ea748299da892ce21283b9ec864053d)

commit 65f8b6f04a8e7002f78f57e3616982dc1966c214
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:04:18 2009 +0100

    s3: "net_usershare_add" only looks at the device and inode
    (cherry picked from commit 50a3344ac87669de665d5ac7a5a9ad63d14f7e38)

commit c31115c8b5826dae6a73cfaf0393ec6b684859ad
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:03:09 2009 +0100

    s3: "net_usershare_add" only looks at the mode and uid
    (cherry picked from commit ad2be463bc386128075331b3695655c997e7aea7)

commit fd90d7dbfd3be79696f15200002d2006865ba2da
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:02:26 2009 +0100

    s3: "count_num_usershares" only looks at the mode
    (cherry picked from commit d51a8d2717c9cd83b530a5d75893bba90c044e84)

commit 753231225d4d50af3dd59bc7f7e7ff5bc838e137
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:01:46 2009 +0100

    s3: "info_fn" only looks at the mode and uid
    (cherry picked from commit 1a38e0fa633e273d17e876926601ce2a3f3f1bb8)

commit 01af5fdd0ad22c13938929800919a4aab60e561f
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:00:51 2009 +0100

    s3: "get_share_list" only looks at the mode and uid
    (cherry picked from commit 2db05665032f927698adadedebb21eb83289140d)

commit 459b9a5a338ecdd67251d5a3f64d42cd89de6200
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 13:00:10 2009 +0100

    s3: "cgi_download" only looks at the mode and size
    (cherry picked from commit 0b8810b80cf9532099851aa0b0989ed107c82454)

commit d0a7a9650b0459b269eb187a8cff30f4a8e99565
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:59:11 2009 +0100

    s3: "print_job_end" only looks at the size
    (cherry picked from commit 5bf61870ef1c982ba5454ee887646aa3cedb32e2)

commit 3084b0ce100ac91a0fe2cc6cf4e0fbf73fac8dc3
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:58:26 2009 +0100

    s3: "check_magic" only looks at the size
    (cherry picked from commit fb87f93adf71a26ff62469c528a8495143a7ab42)

commit 4d624caccb9cfce3b7db0cefd53fff27a93000db
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:57:43 2009 +0100

    s3: "disk_quotas" only looks at the devicenumber
    (cherry picked from commit 0c812dcd2da29ebbd876649def1320e959b5f350)

commit 66a3c8104b4b286f060c53aacf2da52ff229fc69
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:53:48 2009 +0100

    s3: "load_usershare_shares" only looks at the mode and uid
    (cherry picked from commit f93be990f571cfd0a44c0eef88d29138c68d4907)

commit 6cbe0977d9dce9a09633480b3c75bb217caa08be
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:53:23 2009 +0100

    s3: "load_usershare_service" only looks at the mode and uid
    (cherry picked from commit 026befc823b672d3c94af1354c3d817f6ab0ed74)

commit de917b2fa2b22c15696dc65183793daa9d9b88a4
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:52:31 2009 +0100

    s3: "usershare_exists" only looks at the mode and mtime
    (cherry picked from commit f1d180da90b4d7e5cd068360054a77dfc3836921)

commit b40c77ec0ade3331697a2cebb296516101da36d7
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:51:56 2009 +0100

    s3: "process_usershare_file" only looks at the dev, ino, mode and size
    (cherry picked from commit 437681d00fb9f67f3bb5c959b4106af7ba069eeb)

commit 427e3e2d44706f7bc45c49dc7220d9f57433764b
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:51:04 2009 +0100

    s3: "process_usershare_file" only looks at the mode and size
    (cherry picked from commit c8241653f9255372137561e8231384d12eb417f4)

commit df3e4add8d09ef42a2208c72c33c635e1778f1ce
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:49:42 2009 +0100

    s3: "parse_usershare_file" only looks at the mode and uid
    (cherry picked from commit 5bb28252d9bfab6ddc25cf4d97d48398a7e08e8f)

commit 77510519394a157c56ed9886dc5f5cda25894331
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:48:33 2009 +0100

    s3: "tar_parseargs" only looks at the mtime
    (cherry picked from commit 7c3d16a603163d4231cbff708b4e8088d071b40a)

commit de664d4a83a5de96b21dbde477e622f8439f9ef1
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:47:57 2009 +0100

    s3: "dotareof" only looks at the file type
    (cherry picked from commit 34782bbf586c7c554812bcac2573d6db8453b560)

commit 8d0fac630691697501b06dd6c358f547476894dc
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:44:33 2009 +0100

    s3: client "newer" does not look at the create timestamp
    (cherry picked from commit b6e23d526291ec85d5e6ea9fbaf8b8113148931e)

commit 6a9e870355b45cc2e2889fccd7e4f5c1a2431aff
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Nov 27 12:42:39 2009 +0100

    s3: Pass the "fake dir create times" parameter to sys_*stat
    
    Step 0 to restore it as a per-share paramter
    (cherry picked from commit 572b1f7d7fbfd7719b51033f34f139497cda0f00)

commit adaed83b56c5514929e7fb299cd57793f7afa621
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 20:26:01 2009 +0100

    s3-smbd: no drsuapi server stubs yet in s3. Fixes the build, sorry.
    
    Guenther
    (cherry picked from commit 89e02ef1f395d9662c20623bb81e40ba25d10bb4)
    (cherry picked from commit 54994ab1f681ca9c48afcf2bf983117e3890e688)

commit 6f0d6bd3227e06b9045c40190be8ba36e25894f4
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 20:17:07 2009 +0100

    s3-rpc: running minimal_includes.pl on rpc_client and rpc_server.
    
    Guenther
    (cherry picked from commit 5d706a2fd4d5d0489b55d79250c68154600c4102)
    (cherry picked from commit 821e4667e6f496d97e52dd75475ef1a5eaa009cd)

commit 43fba1bdf47227fbb9fdfd16ad2e648906c0fc74
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 18:21:28 2009 +0100

    s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba.
    
    Guenther
    (cherry picked from commit 3d679a3b5fc208d8521217f6a4b4d9037b609b9b)
    (cherry picked from commit 5b051c7accf5f88e46d86e9afa4da0e4152f0fd3)

commit 8b51fc98f10f99fc14e81232b920ff10de0e595a
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 18:15:39 2009 +0100

    s3-passdb: move some defines out of rpc headers (they really belong to passdb).
    
    Guenther
    (cherry picked from commit 86f4536b7a128922b5d5808557e70fa243442361)
    (cherry picked from commit f583a0c75fd30aabec7728d574589f7c71370d91)

commit 949c99977e7f0d3c1b28f25ba8b238ceb484de62
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 18:58:36 2009 +0100

    s3-winbind: properly include netlogon.idl in wbint.idl.
    
    Guenther
    (cherry picked from commit 4d0fca4472500b92cccff8de5a467fe09eb25455)
    (cherry picked from commit b3bf9c66e68722addd6bcd66d7cf5a9e17ff122f)

commit ada27caefecab26c8dcd2cc432f2d6b1e05a21aa
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 18:57:24 2009 +0100

    s3-spoolss: pre cosmetics: reorder levels in construct_printer_info levels.
    
    Guenther
    (cherry picked from commit 85b6461174fd43acd7360c79cebe9b73366a8ff9)
    (cherry picked from commit 0509a99cbfa0bfed92a04f731056a475b670755c)

commit 8ab32fb3fe250991071c55985ef4dee63dee068f
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 10:15:45 2009 +0100

    s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.
    
    Based on patch from Allan <allan at archlinux.org>.
    
    Also should fix the FreeBSD build on the buildfarm.
    
    Guenther
    (cherry picked from commit 5b3a32be97a37c119e837bdee8f049684565458c)
    (cherry picked from commit ec7929a8c783d85a4d30b41b1a9152586bdf2132)

commit 856b759efce0847d1f5a52db577a8d38ba26f397
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 01:25:56 2009 +0100

    s4-smbtorture: refactor RPC-SAMR-LARGE-DC test a little more.
    
    Guenther
    (cherry picked from commit 60419a0eb72c2e07c4b882727b2ccb01b73c52e6)
    (cherry picked from commit a1a49c704b2496006abc8c759023f889dd7986fe)

commit 52a2e9d3356f3f14597be65f4cc354cca1f52bbe
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 26 00:32:47 2009 +0100

    s4-smbtorture: add torture_samr_context to carry some RPC-SAMR-X specifics.
    
    Guenther
    (cherry picked from commit d22eb75a13a294cb31a3f253356853eab48b41d5)
    (cherry picked from commit 358f3c309b02eb4fee62be4ebbbab2b625cfe7e6)

commit 45a77e507f91f2f1a41a1f394f43201eed99b694
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 26 17:18:00 2009 +0100

    tevent: Fix a comment
    (cherry picked from commit dbef8410476bc1eaa8bd68f8996da97782e5b13f)

-----------------------------------------------------------------------

Summary of changes:
 WHATSNEW.txt                                       |   71 ++-
 client/cifs.upcall.c                               |    1 +
 docs-xml/manpages-3/mount.cifs.8.xml               |    2 +-
 docs-xml/smbdotconf/base/enablecorefiles.xml       |   15 +
 docs-xml/smbdotconf/ldap/ldappagesize.xml          |   18 +
 docs-xml/smbdotconf/misc/cachedirectory.xml        |   22 +
 .../smbdotconf/misc/directorynamecachesize.xml     |   14 +
 .../smbdotconf/misc/fakedirectorycreatetimes.xml   |    2 +-
 docs-xml/smbdotconf/misc/statedirectory.xml        |   22 +
 docs-xml/smbdotconf/tuning/aiowritebehind.xml      |   23 +
 examples/VFS/skel_opaque.c                         |    8 +-
 examples/VFS/skel_transparent.c                    |   15 +-
 lib/tevent/tevent_internal.h                       |    2 +-
 librpc/gen_ndr/cli_spoolss.c                       |   46 +-
 librpc/gen_ndr/cli_spoolss.h                       |   20 +-
 librpc/gen_ndr/drsuapi.h                           |    4 +-
 librpc/gen_ndr/misc.h                              |    2 +-
 librpc/gen_ndr/ndr_drsuapi.c                       |    9 +-
 librpc/gen_ndr/ndr_drsuapi.h                       |    1 -
 librpc/gen_ndr/ndr_misc.c                          |  357 ++++++----
 librpc/gen_ndr/ndr_spoolss.c                       |  172 +++--
 librpc/gen_ndr/ndr_spoolss.h                       |   18 +
 librpc/gen_ndr/spoolss.h                           |   71 ++-
 librpc/gen_ndr/srv_spoolss.c                       |   12 +-
 librpc/idl/drsuapi.idl                             |    4 +-
 librpc/idl/misc.idl                                |    4 +-
 librpc/idl/spoolss.idl                             |   54 +-
 librpc/ndr/ndr_drsuapi.c                           |    6 +
 librpc/ndr/ndr_drsuapi.h                           |    2 +
 librpc/ndr/ndr_spoolss_buf.c                       |  212 +++++
 librpc/ndr/ndr_spoolss_buf.h                       |    6 +
 nsswitch/winbind_krb5_locator.c                    |    6 +-
 packaging/RHEL-CTDB/samba.spec.tmpl                |   97 ++-
 pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm            |    2 +-
 release-scripts/create-tarball                     |    8 +-
 source3/Makefile.in                                |   10 +-
 source3/auth/auth_sam.c                            |    4 +-
 source3/client/client.c                            |    9 +-
 source3/client/clitar.c                            |    5 +-
 source3/configure.in                               |  399 ++++++-----
 source3/include/ads.h                              |   71 +--
 source3/include/authdata.h                         |    2 -
 source3/include/includes.h                         |  172 +-----
 source3/include/krb5_protos.h                      |  148 ++++
 source3/include/local.h                            |   20 +-
 source3/include/nt_printing.h                      |    2 -
 source3/include/ntdomain.h                         |    2 +
 source3/include/passdb.h                           |   15 +
 source3/include/proto.h                            |   41 +-
 source3/include/rpc_client.h                       |   44 --
 source3/include/rpc_misc.h                         |   16 -
 source3/include/smb.h                              |    2 -
 source3/include/smb_krb5.h                         |   72 ++
 source3/lib/dbwrap_ctdb.c                          |    4 +-
 source3/lib/debug.c                                |    3 +-
 source3/lib/gencache.c                             |   25 +
 source3/lib/netapi/file.c                          |    1 +
 source3/lib/netapi/getdc.c                         |    1 +
 source3/lib/netapi/group.c                         |    1 +
 source3/lib/netapi/joindomain.c                    |    1 +
 source3/lib/netapi/localgroup.c                    |    2 +
 source3/lib/netapi/netlogon.c                      |    1 +
 source3/lib/netapi/samr.c                          |    1 +
 source3/lib/netapi/serverinfo.c                    |    1 +
 source3/lib/netapi/share.c                         |    1 +
 source3/lib/netapi/shutdown.c                      |    1 +
 source3/lib/netapi/user.c                          |    1 +
 source3/lib/secdesc.c                              |   20 +
 source3/lib/sysquotas.c                            |    6 +-
 source3/lib/system.c                               |   53 +-
 source3/lib/tdb_validate.c                         |   11 +
 source3/lib/util.c                                 |   32 +-
 source3/libads/ads_status.c                        |    1 +
 source3/libads/authdata.c                          |    2 +
 source3/libads/kerberos.c                          |    1 +
 source3/libads/kerberos_keytab.c                   |    1 +
 source3/libads/kerberos_verify.c                   |    1 +
 source3/libads/krb5_errs.c                         |    1 +
 source3/libads/krb5_setpw.c                        |    1 +
 source3/libads/ldap.c                              |    2 +-
 source3/libads/ldap_printer.c                      |    1 +
 source3/libnet/libnet.h                            |    1 +
 source3/libnet/libnet_dssync.c                     |    1 +
 source3/libnet/libnet_join.c                       |    2 +
 source3/libnet/libnet_samsync.c                    |    1 +
 source3/librpc/gen_ndr/ndr_wbint.c                 |    1 +
 source3/librpc/gen_ndr/wbint.h                     |    1 +
 source3/librpc/idl/wbint.idl                       |    2 +-
 source3/libsmb/cliconnect.c                        |    1 +
 source3/libsmb/clikrb5.c                           |    5 +-
 source3/libsmb/clispnego.c                         |    1 +
 source3/libsmb/libsmb_dir.c                        |    2 +-
 source3/libsmb/samlogon_cache.c                    |   46 +-
 source3/libsmb/trusts_util.c                       |    1 +
 source3/locking/brlock.c                           |    5 +
 source3/locking/locking.c                          |   11 +-
 source3/m4/aclocal.m4                              |   57 +-
 source3/modules/onefs_open.c                       |   11 +-
 source3/modules/vfs_acl_common.c                   |  576 ++++++++-------
 source3/modules/vfs_acl_tdb.c                      |   63 +--
 source3/modules/vfs_acl_xattr.c                    |   43 +-
 source3/modules/vfs_afsacl.c                       |   11 +-
 source3/modules/vfs_audit.c                        |   11 +-
 source3/modules/vfs_cacheprime.c                   |    9 +-
 source3/modules/vfs_commit.c                       |    8 +-
 source3/modules/vfs_default.c                      |   55 +-
 source3/modules/vfs_extd_audit.c                   |   10 +-
 source3/modules/vfs_fileid.c                       |    9 +-
 source3/modules/vfs_full_audit.c                   |   10 +-
 source3/modules/vfs_netatalk.c                     |   39 +-
 source3/modules/vfs_onefs.c                        |    9 +-
 source3/modules/vfs_prealloc.c                     |   10 +-
 source3/modules/vfs_readahead.c                    |   11 +-
 source3/modules/vfs_readonly.c                     |    9 +-
 source3/modules/vfs_recycle.c                      |    8 +-
 source3/modules/vfs_smb_traffic_analyzer.c         |   10 +-
 source3/modules/vfs_tsmsm.c                        |   14 +-
 source3/param/loadparm.c                           |   39 +-
 source3/passdb/pdb_smbpasswd.c                     |    4 +-
 source3/printing/nt_printing.c                     |    7 +
 source3/printing/printing.c                        |    2 +-
 source3/registry/regfio.c                          |    6 +-
 source3/rpc_client/cli_lsarpc.c                    |    1 +
 source3/rpc_client/cli_netlogon.c                  |    1 +
 source3/rpc_client/cli_pipe.c                      |    3 +-
 source3/rpc_client/cli_samr.c                      |    1 +
 source3/rpc_client/cli_spoolss.c                   |   26 +-
 source3/rpc_server/srv_dfs_nt.c                    |    1 +
 source3/rpc_server/srv_dssetup_nt.c                |    1 +
 source3/rpc_server/srv_echo_nt.c                   |    1 +
 source3/rpc_server/srv_eventlog_nt.c               |    1 +
 source3/rpc_server/srv_initshutdown_nt.c           |    3 +-
 source3/rpc_server/srv_lsa_nt.c                    |    1 +
 source3/rpc_server/srv_netlog_nt.c                 |    3 +-
 source3/rpc_server/srv_ntsvcs_nt.c                 |    1 +
 source3/rpc_server/srv_pipe.c                      |    2 -
 source3/rpc_server/srv_samr_nt.c                   |    1 +
 source3/rpc_server/srv_spoolss_nt.c                |  807 ++++++++------------
 source3/rpc_server/srv_srvsvc_nt.c                 |    1 +
 source3/rpc_server/srv_svcctl_nt.c                 |    1 +
 source3/rpc_server/srv_winreg_nt.c                 |  129 ++--
 source3/rpc_server/srv_wkssvc_nt.c                 |  537 +++++++++++++-
 source3/rpcclient/cmd_dfs.c                        |    1 +
 source3/rpcclient/cmd_drsuapi.c                    |    1 +
 source3/rpcclient/cmd_dssetup.c                    |    1 +
 source3/rpcclient/cmd_echo.c                       |    1 +
 source3/rpcclient/cmd_epmapper.c                   |    1 +
 source3/rpcclient/cmd_eventlog.c                   |    1 +
 source3/rpcclient/cmd_lsarpc.c                     |    1 +
 source3/rpcclient/cmd_netlogon.c                   |    1 +
 source3/rpcclient/cmd_ntsvcs.c                     |    1 +
 source3/rpcclient/cmd_samr.c                       |    1 +
 source3/rpcclient/cmd_spoolss.c                    |   24 +-
 source3/rpcclient/cmd_srvsvc.c                     |    1 +
 source3/rpcclient/cmd_test.c                       |    1 +
 source3/rpcclient/cmd_wkssvc.c                     |   52 ++
 source3/rpcclient/rpcclient.c                      |    1 +
 source3/script/installman.sh                       |    3 +-
 source3/script/tests/test_posix_s3.sh              |    2 +-
 source3/smbd/close.c                               |  262 +++++++-
 source3/smbd/files.c                               |    2 -
 source3/smbd/lanman.c                              |    2 +
 source3/smbd/open.c                                |   30 +-
 source3/smbd/process.c                             |   14 +
 source3/smbd/quotas.c                              |   28 +-
 source3/smbd/reply.c                               |  354 ++-------
 source3/smbd/service.c                             |    2 +-
 source3/smbd/smb2_tcon.c                           |    2 +-
 source3/smbd/trans2.c                              |   42 +-
 source3/torture/nsstest.c                          |   21 +-
 source3/utils/eventlogadm.c                        |    5 +-
 source3/utils/net_ads.c                            |    1 +
 source3/utils/net_conf.c                           |    2 +-
 source3/utils/net_dom.c                            |    1 +
 source3/utils/net_rpc.c                            |   10 +-
 source3/utils/net_rpc_audit.c                      |    1 +
 source3/utils/net_rpc_join.c                       |    2 +
 source3/utils/net_rpc_printer.c                    |   14 +-
 source3/utils/net_rpc_registry.c                   |    1 +
 source3/utils/net_rpc_rights.c                     |    1 +
 source3/utils/net_rpc_service.c                    |    2 +-
 source3/utils/net_rpc_sh_acct.c                    |    1 +
 source3/utils/net_usershare.c                      |   12 +-
 source3/utils/net_util.c                           |    2 +
 source3/utils/ntlm_auth.c                          |    1 +
 source3/utils/smbget.c                             |    4 +-
 source3/utils/smbtree.c                            |    1 +
 source3/utils/testparm.c                           |   21 +
 source3/web/cgi.c                                  |    9 +-
 source3/web/swat.c                                 |   16 +-
 source3/winbindd/winbindd_ads.c                    |    1 +
 source3/winbindd/winbindd_cm.c                     |    4 +
 source3/winbindd/winbindd_cred_cache.c             |    2 +
 source3/winbindd/winbindd_dual_srv.c               |    1 +
 source3/winbindd/winbindd_misc.c                   |    1 +
 source3/winbindd/winbindd_pam.c                    |    3 +
 source3/winbindd/winbindd_rpc.c                    |   12 +-
 source4/torture/nbench/nbench.c                    |    4 +-
 source4/torture/rpc/samr.c                         |  223 +++---
 source4/torture/rpc/spoolss.c                      |  509 +++++++++----
 source4/torture/rpc/spoolss_win.c                  |   28 +-
 201 files changed, 4354 insertions(+), 2577 deletions(-)
 create mode 100644 docs-xml/smbdotconf/base/enablecorefiles.xml
 create mode 100644 docs-xml/smbdotconf/ldap/ldappagesize.xml
 create mode 100644 docs-xml/smbdotconf/misc/cachedirectory.xml
 create mode 100644 docs-xml/smbdotconf/misc/directorynamecachesize.xml
 create mode 100644 docs-xml/smbdotconf/misc/statedirectory.xml
 create mode 100644 docs-xml/smbdotconf/tuning/aiowritebehind.xml
 create mode 100644 source3/include/krb5_protos.h
 delete mode 100644 source3/include/rpc_client.h
 create mode 100644 source3/include/smb_krb5.h


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 764f545..7dcafd5 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -82,7 +82,7 @@ New configure options
 Commit Highlights
 =================
 
-o   Björn Jacke <bjacke at sernet.de>
+o   Björn Jacke <bj at sernet.de>
     * Add support for full Windows timestamp resolution.
     * Add encryption support for connections to a CUPS server.
 
@@ -96,6 +96,75 @@ o   Stefan Metzmacher <metze at samba.org>
     * Implement the new SMB2 protocol (experimental).
 
 
+Changes since 3.5.0pre1
+-----------------------
+
+o   Michael Adam <obnox at samba.org>
+    * Fix the build when no external talloc and tdb are installed.
+    * Fix detection of CTDB headers on systems without system-libtalloc.
+
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 6802: A created folder does not properly inherit permissions from
+      parent in vfs_acl_xattr.
+    * BUG 6837: "Too many open files" when trying to access large number of
+      files from Windows 7.
+    * BUG 6938 : No hook exists to check creation rights when using acl_xattr
+      module.
+    * Fix vfs_acl_xattr which was failing to call the NEXT connect function.
+    * Restructure the ACL code.
+    * Refactor reply_rmdir to use handle based code.
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 6929: Fix build with recent heimdal.
+    * Fix several printing issues.
+    * Fix the build on Mac OS X 10.6.2.
+    * Fix net and rpcclient after setprinterdataex changes.
+
+
+o   Björn Jacke <bj at sernet.de>
+    * Prefer posix_fallocate for doing "strict allocate".
+
+
+o   Matt Kraai <mkraai at beckman.com>
+    * BUG 6860: Fix shared library build on QNX.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 6288: SWAT adds a second share when changing parameters of an existing
+      share.
+    * BUG 6435: Fix minor memory corruption.
+    * Restore "fake directory create times" as a share parameter.
+    * Fix explicit stat64 support.
+    * Add support for NetWkstaGetInfo 101 and 102.
+    * Add rpcclient wkssvc_enumerateusers.
+    * De-deprecate "write cache size" to prevent its removal without a proper
+      alternative.
+
+
+o   Jim McDonough <jmcd at samba.org>
+    * BUG 6967: Prevent glibc error on 'net ads join'.
+
+
+o   Lars Müller <lars at samba.org>
+    * BUG 6710: Only install the cifs.upcall man page if CIFSUPCALL_PROGS was
+      set while configure.
+
+
+o   Ian Puleston <ipuleston at sonicwall.com>
+    * Complete support for NetWkstaGetInfo/NetWkstaEnumUsers.
+
+
+o   Karolin Seeger <kseeger at samba.org>
+    * Fix the build of the example VFS modules.
+
+
+o   Bo Yang <boyang at samba.org>
+    * BUG 6879: Fix crash in Winbind.
+    * Fix crash in free_file_list().
+
+
 ######################################################################
 Reporting bugs & Development Discussion
 #######################################
diff --git a/client/cifs.upcall.c b/client/cifs.upcall.c
index 063e423..bfc70d1 100644
--- a/client/cifs.upcall.c
+++ b/client/cifs.upcall.c
@@ -27,6 +27,7 @@ create dns_resolver * * /usr/local/sbin/cifs.upcall %k
 
 #include "includes.h"
 #include "../libcli/auth/spnego.h"
+#include "smb_krb5.h"
 #include <keyutils.h>
 #include <getopt.h>
 
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index 4f775e8..0beb968 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -121,7 +121,7 @@ below) or entered at the password prompt will be read correctly.
 <programlisting>
 		username=<replaceable>value</replaceable>
 		password=<replaceable>value</replaceable>
-		workgroup=<replaceable>value</replaceable>
+		domain=<replaceable>value</replaceable>
 </programlisting>
 
 		<para>
diff --git a/docs-xml/smbdotconf/base/enablecorefiles.xml b/docs-xml/smbdotconf/base/enablecorefiles.xml
new file mode 100644
index 0000000..8c8bacf
--- /dev/null
+++ b/docs-xml/smbdotconf/base/enablecorefiles.xml
@@ -0,0 +1,15 @@
+<samba:parameter name="enable core files"
+                 context="G"
+                 basic="1" advanced="1" developer="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+
+<description>
+        <para>This parameter specifies whether core dumps should be written
+	on internal exits. Normally set to <constant>yes</constant>.
+	You should never need to change this.
+	</para>
+</description>
+
+	<value type="default">yes</value>
+	<value type="example">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/ldap/ldappagesize.xml b/docs-xml/smbdotconf/ldap/ldappagesize.xml
new file mode 100644
index 0000000..bc09b98
--- /dev/null
+++ b/docs-xml/smbdotconf/ldap/ldappagesize.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="ldap page size"
+	context="G"
+	type="integer"
+	advanced="1" developer="1"
+        xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>
+	This parameter specifies the number of entries per page.
+	</para>
+
+	<para>If the LDAP server supports paged results, clients can
+	request	subsets of search results (pages) instead of the entire list.
+	This parameter specifies the size of these pages.
+	</para>
+</description>
+<value type="default">1024</value>
+<value type="example">512</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/cachedirectory.xml b/docs-xml/smbdotconf/misc/cachedirectory.xml
new file mode 100644
index 0000000..5216998
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/cachedirectory.xml
@@ -0,0 +1,22 @@
+<samba:parameter name="cache directory"
+                 context="G"
+                 advanced="1" developer="1"
+		 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>Usually, most of the TDB files are stored in the <parameter
+	moreinfo="none">lock directory</parameter>. Since Samba 3.4.0, it is
+	possible to differentiate between TDB files with persistent data and
+	TDB files with non-persistent data using the
+	<parameter moreinfo="none">state directory</parameter> and the
+	<parameter moreinfo="none">cache directory</parameter> options.
+	</para>
+
+	<para> This option specifies the directory where TDB files containing
+	non-persistent data will be stored.
+	</para>
+</description>
+
+<value type="default">${prefix}/var/locks</value>
+<value type="example">/var/run/samba/locks/cache</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/directorynamecachesize.xml b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
new file mode 100644
index 0000000..1064b7e
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
@@ -0,0 +1,14 @@
+<samba:parameter name="directory name cache size"
+		 context="S"
+		 type="integer"
+		 advanced="1"
+		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>
+	This parameter specifies the the size of the directory name cache.
+	It will be needed to turn this off for *BSD systems.
+	</para>
+
+</description>
+<value type="default">100</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
index 7c8807e..974b6f0 100644
--- a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
+++ b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml
@@ -1,5 +1,5 @@
 <samba:parameter name="fake directory create times"
-		 context="G"
+		 context="S"
 		 type="boolean"
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
diff --git a/docs-xml/smbdotconf/misc/statedirectory.xml b/docs-xml/smbdotconf/misc/statedirectory.xml
new file mode 100644
index 0000000..f8cfcdf
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/statedirectory.xml
@@ -0,0 +1,22 @@
+<samba:parameter name="state directory"
+                 context="G"
+                 advanced="1" developer="1"
+		 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>Usually, most of the TDB files are stored in the
+	<parameter moreinfo="none">lock directory</parameter>. Since
+	Samba 3.4.0, it is possible to differentiate between TDB files
+	with persistent data and TDB files with non-persistent data using
+	the <parameter moreinfo="none">state directory</parameter> and the
+	<parameter moreinfo="none">cache directory</parameter> options.
+	</para>
+
+	<para> This option specifies the directory where TDB files containing
+	persistent data will be stored.
+	</para>
+</description>
+
+<value type="default">${prefix}/var/locks</value>
+<value type="example">/var/run/samba/locks/state</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/tuning/aiowritebehind.xml b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
new file mode 100644
index 0000000..c88cd97
--- /dev/null
+++ b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
@@ -0,0 +1,23 @@
+<samba:parameter name="aio write behind"
+                 context="S"
+		 type="string"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>If Samba has been built with asynchronous I/O support,
+	Samba will not wait until write requests are finished before returning
+	the result to the client for files listed in this parameter.
+	Instead, Samba will immediately return that the write
+	request has been finished successfully, no matter if the
+	operation will succeed or not. This might speed up clients without
+	aio support, but is really dangerous, because data could be lost
+	and files could be damaged.
+	</para>
+	<para>
+	The syntax is identical to the <smbconfoption name="veto files"/>
+	parameter.
+	</para>
+</description>
+
+<value type="default"/>
+<value type="example">/*.tmp/</value>
+</samba:parameter>
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 243621e..380b3b6 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -313,7 +313,7 @@ static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_
 	return false;
 }
 
-static int skel_kernel_flock(struct vfs_handle_struct *handle, struct files_struct *fsp, uint32 share_mode)
+static int skel_kernel_flock(struct vfs_handle_struct *handle, struct files_struct *fsp, uint32 share_mode, uint32 access_mask)
 {
 	errno = ENOSYS;
 	return -1;
@@ -454,8 +454,10 @@ static void skel_strict_unlock(struct vfs_handle_struct *handle,
 }
 
 static NTSTATUS skel_translate_name(struct vfs_handle_struct *handle,
-				char **mapped_name,
-				enum vfs_translate_direction direction)
+				const char *mapped_name,
+				enum vfs_translate_direction direction,
+				TALLOC_CTX *mem_ctx,
+				char **pmapped_name)
 {
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index c52b057..27363ff 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -295,9 +295,9 @@ static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_
 	return SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type);
 }
 
-static int skel_kernel_flock(struct vfs_handle_struct *handle, struct files_struct *fsp, uint32 share_mode)
+static int skel_kernel_flock(struct vfs_handle_struct *handle, struct files_struct *fsp, uint32 share_mode, uint32 access_mask)
 {
-	return SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode);
+	return SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, access_mask);
 }
 
 static int skel_linux_setlease(struct vfs_handle_struct *handle, struct files_struct *fsp, int leasetype)
@@ -443,12 +443,13 @@ static void skel_strict_unlock(struct vfs_handle_struct *handle,
 }
 
 static NTSTATUS skel_translate_name(struct vfs_handle_struct *handle,
-				char **mapped_name,
-				enum vfs_translate_direction direction)
+				const char *mapped_name,
+				enum vfs_translate_direction direction,
+				TALLOC_CTX *mem_ctx,
+				char **pmapped_name)
 {
-	return SMB_VFS_NEXT_TRANSLATE_NAME(handle,
-					mapped_name,
-					direction);
+	return SMB_VFS_NEXT_TRANSLATE_NAME(handle, mapped_name, direction,
+					   mem_ctx, pmapped_name);
 }
 
 static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
diff --git a/lib/tevent/tevent_internal.h b/lib/tevent/tevent_internal.h
index 4e3b7b5..e10f52e 100644
--- a/lib/tevent/tevent_internal.h
+++ b/lib/tevent/tevent_internal.h
@@ -142,7 +142,7 @@ struct tevent_req {
 		struct tevent_immediate *trigger;
 
 		/**
-		 * @brief the timer event if tevent_req_set_timeout was used
+		 * @brief the timer event if tevent_req_set_endtime was used
 		 *
 		 */
 		struct tevent_timer *timer;
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 635a817..e63a781 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -11057,7 +11057,7 @@ static void rpccli_spoolss_EnumPrinterData_done(struct tevent_req *subreq)
 	}
 
 	/* Copy out parameters */
-	memcpy(discard_const_p(uint8_t, state->orig.out.value_name), state->tmp.out.value_name, (state->tmp.in.value_offered / 2) * sizeof(*state->orig.out.value_name));
+	memcpy(discard_const_p(uint8_t *, state->orig.out.value_name), state->tmp.out.value_name, (state->tmp.in.value_offered / 2) * sizeof(*state->orig.out.value_name));
 	*state->orig.out.value_needed = *state->tmp.out.value_needed;
 	*state->orig.out.type = *state->tmp.out.type;
 	memcpy(state->orig.out.data, state->tmp.out.data, (state->tmp.in.data_offered) * sizeof(*state->orig.out.data));
@@ -11132,7 +11132,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterData(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
-	memcpy(discard_const_p(uint8_t, value_name), r.out.value_name, (r.in.value_offered / 2) * sizeof(*value_name));
+	memcpy(discard_const_p(uint8_t *, value_name), r.out.value_name, (r.in.value_offered / 2) * sizeof(*value_name));
 	*value_needed = *r.out.value_needed;
 	*type = *r.out.type;
 	memcpy(data, r.out.data, (r.in.data_offered) * sizeof(*data));
@@ -11710,8 +11710,8 @@ struct tevent_req *rpccli_spoolss_SetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
 							const char *_key_name /* [in] [charset(UTF16)] */,
 							const char *_value_name /* [in] [charset(UTF16)] */,
 							enum winreg_Type _type /* [in]  */,
-							uint8_t *_buffer /* [in] [ref,size_is(offered)] */,
-							uint32_t _offered /* [in]  */)
+							union spoolss_PrinterData _data /* [in] [subcontext(4),switch_is(type)] */,
+							uint32_t __offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */)
 {
 	struct tevent_req *req;
 	struct rpccli_spoolss_SetPrinterDataEx_state *state;
@@ -11730,8 +11730,8 @@ struct tevent_req *rpccli_spoolss_SetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
 	state->orig.in.key_name = _key_name;
 	state->orig.in.value_name = _value_name;
 	state->orig.in.type = _type;
-	state->orig.in.buffer = _buffer;
-	state->orig.in.offered = _offered;
+	state->orig.in.data = _data;
+	state->orig.in._offered = __offered;
 
 	/* Out parameters */
 
@@ -11814,8 +11814,8 @@ NTSTATUS rpccli_spoolss_SetPrinterDataEx(struct rpc_pipe_client *cli,
 					 const char *key_name /* [in] [charset(UTF16)] */,
 					 const char *value_name /* [in] [charset(UTF16)] */,
 					 enum winreg_Type type /* [in]  */,
-					 uint8_t *buffer /* [in] [ref,size_is(offered)] */,
-					 uint32_t offered /* [in]  */,
+					 union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
+					 uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
 					 WERROR *werror)
 {
 	struct spoolss_SetPrinterDataEx r;
@@ -11826,8 +11826,8 @@ NTSTATUS rpccli_spoolss_SetPrinterDataEx(struct rpc_pipe_client *cli,
 	r.in.key_name = key_name;
 	r.in.value_name = value_name;
 	r.in.type = type;
-	r.in.buffer = buffer;
-	r.in.offered = offered;
+	r.in.data = data;
+	r.in._offered = _offered;
 
 	status = cli->dispatch(cli,
 				mem_ctx,
@@ -11868,9 +11868,9 @@ struct tevent_req *rpccli_spoolss_GetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
 							struct policy_handle *_handle /* [in] [ref] */,
 							const char *_key_name /* [in] [charset(UTF16)] */,
 							const char *_value_name /* [in] [charset(UTF16)] */,
-							enum winreg_Type *_type /* [out] [ref] */,
-							uint8_t *_buffer /* [out] [ref,size_is(offered)] */,
 							uint32_t _offered /* [in]  */,
+							enum winreg_Type *_type /* [out] [ref] */,
+							union spoolss_PrinterData *_data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
 							uint32_t *_needed /* [out] [ref] */)
 {
 	struct tevent_req *req;
@@ -11893,7 +11893,7 @@ struct tevent_req *rpccli_spoolss_GetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
 
 	/* Out parameters */
 	state->orig.out.type = _type;
-	state->orig.out.buffer = _buffer;
+	state->orig.out.data = _data;
 	state->orig.out.needed = _needed;
 
 	/* Result */
@@ -11943,7 +11943,7 @@ static void rpccli_spoolss_GetPrinterDataEx_done(struct tevent_req *subreq)
 
 	/* Copy out parameters */
 	*state->orig.out.type = *state->tmp.out.type;
-	memcpy(state->orig.out.buffer, state->tmp.out.buffer, (state->tmp.in.offered) * sizeof(*state->orig.out.buffer));
+	*state->orig.out.data = *state->tmp.out.data;
 	*state->orig.out.needed = *state->tmp.out.needed;
 
 	/* Copy result */
@@ -11983,9 +11983,9 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
 					 struct policy_handle *handle /* [in] [ref] */,
 					 const char *key_name /* [in] [charset(UTF16)] */,
 					 const char *value_name /* [in] [charset(UTF16)] */,
-					 enum winreg_Type *type /* [out] [ref] */,
-					 uint8_t *buffer /* [out] [ref,size_is(offered)] */,
 					 uint32_t offered /* [in]  */,
+					 enum winreg_Type *type /* [out] [ref] */,
+					 union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
 					 uint32_t *needed /* [out] [ref] */,
 					 WERROR *werror)
 {
@@ -12014,7 +12014,7 @@ NTSTATUS rpccli_spoolss_GetPrinterDataEx(struct rpc_pipe_client *cli,
 
 	/* Return variables */
 	*type = *r.out.type;
-	memcpy(buffer, r.out.buffer, (r.in.offered) * sizeof(*buffer));
+	*data = *r.out.data;
 	*needed = *r.out.needed;
 
 	/* Return result */
@@ -12207,7 +12207,7 @@ struct tevent_req *rpccli_spoolss_EnumPrinterKey_send(TALLOC_CTX *mem_ctx,
 						      struct rpc_pipe_client *cli,
 						      struct policy_handle *_handle /* [in] [ref] */,
 						      const char *_key_name /* [in] [charset(UTF16)] */,
-						      uint16_t *_key_buffer /* [out] [ref,size_is(offered/2)] */,
+						      struct spoolss_StringArray2 *_key_buffer /* [out] [ref] */,
 						      uint32_t _offered /* [in]  */,
 						      uint32_t *_needed /* [out] [ref] */)
 {
@@ -12278,7 +12278,7 @@ static void rpccli_spoolss_EnumPrinterKey_done(struct tevent_req *subreq)
 	}
 
 	/* Copy out parameters */
-	memcpy(state->orig.out.key_buffer, state->tmp.out.key_buffer, (state->tmp.in.offered / 2) * sizeof(*state->orig.out.key_buffer));
+	*state->orig.out.key_buffer = *state->tmp.out.key_buffer;
 	*state->orig.out.needed = *state->tmp.out.needed;
 
 	/* Copy result */
@@ -12317,7 +12317,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct rpc_pipe_client *cli,
 				       TALLOC_CTX *mem_ctx,
 				       struct policy_handle *handle /* [in] [ref] */,
 				       const char *key_name /* [in] [charset(UTF16)] */,
-				       uint16_t *key_buffer /* [out] [ref,size_is(offered/2)] */,
+				       struct spoolss_StringArray2 *key_buffer /* [out] [ref] */,
 				       uint32_t offered /* [in]  */,
 				       uint32_t *needed /* [out] [ref] */,
 				       WERROR *werror)
@@ -12345,7 +12345,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterKey(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
-	memcpy(key_buffer, r.out.key_buffer, (r.in.offered / 2) * sizeof(*key_buffer));
+	*key_buffer = *r.out.key_buffer;
 	*needed = *r.out.needed;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list