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

Karolin Seeger kseeger at samba.org
Wed Jan 25 11:26:31 MST 2012


The branch, v3-6-stable has been updated
       via  b0cd2e5 WHATSNEW: Add another change.
       via  f26d59d s3-spoolss: Pass the right pointer type.
       via  f7ad887 WHATSNEW: Add another change.
       via  2f90581 Second part of fix for 8636 - When returning an ACL without SECINFO_DACL requested, we still set SEC_DESC_DACL_PRESENT in the type field.
       via  d6f0dda Fix bug 8636 - When returning an ACL without SECINFO_DACL requested, we still set SEC_DESC_DACL_PRESENT in the type field.
       via  3af1345 WHATSNEW: Add major changes.
       via  362bf0b WHATSNEW: Add more changes.
       via  b75dc6e torture: add spoolss overlapping driver deletion tests
       via  f0b7a5c torture: confirm printer driver file removal (cherry picked from commit 31f491c98c07e468e1f0e840f6accb6da3281498)
       via  7673b1b torture: add spoolss del printer driver test
       via  6230861 s3-spoolss: fix printer_driver_files_in_use() call ordering
       via  e6ef4d2 s3-spoolss: fix printer driver version deletion
       via  cdd7799 s3-spoolss: prefix print$ path on driver file deletion
       via  4bb3a17 spoolss: fix DPD_DELETE_ALL_FILES error return
       via  dc29cb3 WHATSNEW: Add more changes since 3.6.1.
       via  d419d61 WHATSNEW: Start release notes for 3.6.2.
       via  798461a [PATCH] s3: improve the code in the AES encryption.
       via  9bea091 s3: Fix bug #8674.
       via  5effeb2 Third part of fix for bug #8673 - NT ACL issue.
       via  713e106 Second part of fix for bug #8673 - NT ACL issue.
       via  cf50115 First part of fix for bug #8673 - NT ACL issue.
       via  f6a6b15 Third part of fix for bug #8663 - deleting a symlink fails if the symlink target is outside of the share.
       via  b0099de Second part of fix for bug #8663 - deleting a symlink fails if the symlink target is outside of the share.
       via  92b8b04 First part of fix for bug #8663 - deleting a symlink fails if the symlink target is outside of the share.
       via  5033661 Fix bug 8710 - connections.tdb - major leak with SMB2.
       via  2dcf226 Fix bug #8664 - Renaming a symlink fails if the symlink target is outside of the share. (cherry picked from commit 6e77eac8f21925460e3b1946c2c22f6eff296322)
       via  9f700b8 idl: add to_null property
       via  acb8260 idl: add to_null attribute to the spoolss devicename array
       via  f83cd0a idl: add to_null attribute to the spoolss formname array
       via  a2fa0c0 ndr: add ndr_pull_charset_to_null()
       via  de9aa67 idl: add parser for the to_null property
       via  531a182 s3-libads: fix malloc/talloc mismatch in ads_keytab_verify_ticket().
       via  5950aa4 libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593)
       via  33b1603 s3:lib/ctdbd_conn: try ctdbd_init_connection() as root (bug #8684)
       via  9f07ef2 s3-printing: fix migrate printer code (bug 8618)
       via  cc2ba64 Fix bug #8686 - Packet validation checks can be done before length validation causing uninitialized memory read. (cherry picked from commit 24ac26ddfd9ee8841d1984e710a4dfe535b9abcf)
       via  9d0ef46 Fix bug #8687 - net memberships usage info is wrong
       via  dacc837 s3-libsmb: Don't duplicate kerberos service tickets.
       via  0ba828c Final part of fix for bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write.
       via  b5b1068 Third part of fix for bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write.
       via  41b0d21 Second part of fix for bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write.
       via  bbaf290 Fix bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write
       via  5aa7fe1 s3-cli: fix bug 563, >8GB tar on BE machines
       via  bd206fb s3-winbind: Fix segfault if we can't map the last user.
       via  c30ce0b s3-winbind: Move finding the domain to it's own function.
       via  45c5b63 Fix bug #8644 - vfs_acl_xattr and vfs_acl_tdb modules can fail to add inheritable entries on a directory with no stored ACL.
       via  47af65c s3/doc: document the ignore system acls option of vfs_acl_xattr and vfs_acl_tdb
       via  7ec243b s3: Fix bug 8371
       via  a72e1fa s3-winbind: Add an update function for winbind cache.
       via  62a4f81 s3: Attempt to fix the vfs_commit module
       via  d6c51ce Fix bug 8631 - POSIX ACE x permission becomes rx following mapping to and from a DACL Reported by David Disseldorp. Fix based on a patch by David.
       via  ebbe03b Improve configure.in so it can be used outside the Samba source tree.
       via  b329caa s3:libsmb: only align unicode pipe_name (bug #8586)
       via  3641753 s3-winbind: Don't fail on users without a uid.
       via  2c858e9 lib/util/ Fix crash bug caused by gfree_debug()
       via  ba60598 s3: allow to set TCP_NODELAYACK socket option on AIX (#8616)
       via  5d90356 s3/packaging: Fix rpm build issues on RHEL4.
       via  05fe619 s3/packaging: Fix rpm build issues on RHEL.
       via  44489d1 Fix bug #8562 - talloc: double free error.
       via  0a7ff28 libcli-cldap: avoid the case local == remote == NULL (cherry picked from commit 4d2d33ee09941ddb211e21788c01d886730224c2)
       via  0cfe6c0 libcli/cldap: make sure the local and remote address family matches
       via  9f07900 s3:libsmb: consistently use state->size in cli_write_andx_create() (bug #5326)
       via  9cb4a9a s3:libsmb: fix cli_write_and_x() against OS/2 print shares (bug #5326)
       via  dda4a8b Ensure we correctly calculate reply credits over all returned SMB2 replies, and do as Windows does and return the total in the last SMB2 reply. Fixes an issue found by Christian M Ambach <christian.ambach at de.ibm.com> (and thanks to Christian for the initial patch this was based on). (cherry picked from commit 65566dfa8629136eaf0dc1491502dc651d1a4858)
       via  d384873 s3:smb2_flush: outbody only needs 4 bytes
       via  64b0987 Fix bug #8561 - Password change settings not fully observed.
       via  5d104ff s3:smb2_server: grant credits in async interim responses (bug #8357)
       via  23067ab s3:smbd: don't limit the number of open dptrs for smb2 (bug #8592)
       via  ffa8cef s3:smbd: fully construct the dptr before allocating a dnum in the bitmap
       via  2ae3ef7 s3:smbd: avoid string_set() in dir.c
       via  ab82951 samr: filterModuleName is a lsa_String in userPwdChangeFailureInformation.
       via  65721f9 s4-smbtorture: demonstrate how broken our samr_ChangePasswordUser3 marshalling is...
       via  7cdaf23 s3:idmap_autorid: document allocation pool
       via  d5f6dcb s3:idmap_autorid: add an allocation range to autorid
       via  712d1a0 s3:idmap_autorid: move HWM initialization into a function
       via  f15f3f0 s3:idmap_autorid: use strings as parameter for range allocator
       via  876bf1c systemd: Fix dependencies.
       via  f1ea6d6 pkg: add comments to the systemd sysconfig file
       via  f2863f8 Add systemd service files.
       via  930dd60 s3:libsmb: the workgroup in the non-extended-security negprot is not aligned (#8573)
       via  aae6ea6 s3-wafbuild: Fix inotify detection (bug 8580)
       via  df819dd s3-build: Fix inotify detection (bug 8580)
       via  36d7235 s3:smb2_server: FLAG_CHAINED means we always use the last session_id and tid
       via  ca3572e smb2_constants: add SMB2_HDR_CREDIT_CHARGE
       via  72fb660 s3:smb2_server: don't reset the tid and session id in the out hdr of compound requests
       via  8240b5d s3:smb2_server: echo the SMB2_HDR_CREDIT_CHARGE and SMB2_HDR_SIGNATURE fields
       via  bb18e26 s3:smbd increase a debug level
       via  f00857f Properly fix bug #8384 - Windows XP clients seem to crash smbd process every once in a while.
       via  a0c80c5 examples: Fix perl path.
       via  6cbf363 s3-netlogon: Fix setting the machinge account password.
       via  6f3fda8 Fix bug #8548 - winbind_samlogon_retry_loop ignores logon_parameters flags.
       via  451d31d Fix bug #8542 - smbclient posix_open command fails to return correct info on open file. (cherry picked from commit d27f5a277ef47c5ff94e402930680b37e8f4d592)
       via  8edfc0f Third part of fix for bug #8541 - readlink() on Linux clients fails if the symlink target is outside of the share.
       via  c4b6e73 Second part of fix for bug #8541 - readlink() on Linux clients fails if the symlink target is outside of the share.
       via  df54997 Fix bug #8541 - readlink() on Linux clients fails if the symlink target is outside of the share.
       via  1f8ff6c Use existing ISDOT and ISDOTDOT macros.
       via  389e98a s3-netapi: remove pointless use_memory_krb5_ccache.
       via  667b3ce s3:Makefile: make DSO_EXPORTS_CMD more portable (#8531)
       via  9a277d8 Add new contributing FAQ announcing acceptance of corporate (C).
       via  d8a80d8 Fix sys_fseek wrapper
       via  83006b7 s3:registry: fix the test for a REG_SZ blob possibly being a zero terminated ucs2 string
       via  1185167 s3:registry: reg_format: handle unterminated REG_SZ blobs
       via  f568581 First part of fix for bug #8419 - Make VFS op "streaminfo" stackable.
       via  6afaac7 Add support for VFS op streaminfo chaining in all relevant VFS modules.
      from  8bc8681 WHATSNEW: Start release notes for Samba 3.6.2.

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


- Log -----------------------------------------------------------------
commit b0cd2e547f4db250e10db852fd3e902404b9601e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Jan 25 19:23:06 2012 +0100

    WHATSNEW: Add another change.
    
    Jeremy, thanks a lot for the fix!
    (cherry picked from commit a3dcfb66bb3763ee95f2bfe8b7a615ffee859985)

commit f26d59d2eede760d6b8465323db44697109bc444
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 25 19:19:14 2012 +0100

    s3-spoolss: Pass the right pointer type.
    
    Follow-up fix for an issue introduced by a fix for bug #4942.
    (cherry picked from commit 69fafa216ee45829d330e9564858f6702b4b268d)

commit f7ad88762b28bed385260cf031b14e47855ebf10
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 23 21:39:58 2012 +0100

    WHATSNEW: Add another change.
    
    Karolin
    (cherry picked from commit 788c8af4453bcb711da2712d8526c22689b49d38)

commit 2f90581a5e68da48d03127c453a0c3becb2170e2
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 23 11:20:52 2012 -0800

    Second part of fix for 8636 - When returning an ACL without SECINFO_DACL requested, we still set SEC_DESC_DACL_PRESENT in the type field.
    
    Ensure we always ask for the set:
    
    OWNER_SECURITY_INFORMATION |
    GROUP_SECURITY_INFORMATION |
    DACL_SECURITY_INFORMATION  |
    SACL_SECURITY_INFORMATION
    
    when getting an ACL inside the module.
    (cherry picked from commit 4eb17aff84dc0dccec23e066db7a88581cf7668c)

commit d6f0ddae114ed77e0afec4f9c72b55a41fd800eb
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 29 16:31:18 2011 -0800

    Fix bug 8636 - When returning an ACL without SECINFO_DACL requested, we still set SEC_DESC_DACL_PRESENT in the type field.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed Nov 30 04:59:07 CET 2011 on sn-devel-104
    (cherry picked from commit da992be64f39364fbb8bca26e9421c7a36c49ac6)
    (cherry picked from commit c0ad67c1888e44be77d8f34681f12fc8b4f19f86)

commit 3af134540cdf12276f677502a1090170d8b25d70
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 23 21:22:40 2012 +0100

    WHATSNEW: Add major changes.
    
    Please feel free to add more entries.
    
    Karolin
    (cherry picked from commit 0b19c19ec6057b03fe0cbee91bbf974ca6bf3221)

commit 362bf0b70f295909c125973e9873340780d200d5
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 23 20:52:37 2012 +0100

    WHATSNEW: Add more changes.
    
    Karolin
    (cherry picked from commit db645b334e591133d664a7d1f88e82925ad52c40)

commit b75dc6e8465c1da7c39f5984b31ea80b83a0cd7a
Author: David Disseldorp <ddiss at samba.org>
Date:   Tue Jan 17 17:07:01 2012 +0100

    torture: add spoolss overlapping driver deletion tests
    
    The last 7 patches address bug #8697 (DeletePrinterDriverEx never removes
    printer driver files) and bug #4942 (DeletePrinterDriverEx deletes files
    in use).
    (cherry picked from commit c4a3d988a64723a51be4b3ddaddd83708d90ed13)

commit f0b7a5c638d9f1993fd78b3dc72d810b7157fbdd
Author: David Disseldorp <ddiss at samba.org>
Date:   Tue Jan 17 15:20:51 2012 +0100

    torture: confirm printer driver file removal
    (cherry picked from commit 31f491c98c07e468e1f0e840f6accb6da3281498)

commit 7673b1bbc8423eefd02353fb0e49373b8e3f2469
Author: David Disseldorp <ddiss at samba.org>
Date:   Mon Jan 16 16:30:17 2012 +0100

    torture: add spoolss del printer driver test
    
    Test handling of DeletePrinterDriverEx when the DPD_DELETE_ALL_FILES
    flag is set.
    (cherry picked from commit b894e6297f36b05259fc6932a7ee1c500bc806e9)

commit 6230861e7212fbfa4dfff8bec2ed21de94e52d9d
Author: David Disseldorp <ddiss at samba.org>
Date:   Tue Jan 17 17:06:38 2012 +0100

    s3-spoolss: fix printer_driver_files_in_use() call ordering
    
    printer_driver_files_in_use() performs two tasks: it returns whether any
    of the files in the to-be-deleted driver overlap with other drivers, it
    also trims such files from the info structure passed in.
    
    In processing a DeletePrinterDataEx request with DPD_DELETE_UNUSED_FILES
    set, printer_driver_files_in_use() must be called to ensure files in
    use by other drivers are not removed.
    
    https://bugzilla.samba.org/show_bug.cgi?id=4942
    (cherry picked from commit 8e3c0ac2815bc25360bf408c50449d154b841f8a)

commit e6ef4d2451f5c35992281772591b8c740392b5a7
Author: David Disseldorp <ddiss at samba.org>
Date:   Thu Jan 12 16:27:37 2012 +0100

    s3-spoolss: fix printer driver version deletion
    
    Spoolss delete printer driver code currently makes invalid version
    assumptions based on the architecture requested by the client.
    
    Ugly hacks are in place to cover removal of other versions (2 and 3).
    This change wraps multi version deletion in a simple for loop.
    (cherry picked from commit 54bc662adb24be9950c827446130b91504965c8c)

commit cdd7799ebfa96c16e96ca402eee20d7cd0beae01
Author: David Disseldorp <ddiss at samba.org>
Date:   Wed Jan 11 19:50:36 2012 +0100

    s3-spoolss: prefix print$ path on driver file deletion
    
    Driver file paths stored in the registry do not include the server path
    prefix. delete_driver_files() incorrectly assumes such a prefix.
    
    https://bugzilla.samba.org/show_bug.cgi?id=8697
    (cherry picked from commit c14586647451a878fdc911ee4be699b3e6485b83)

commit 4bb3a17a66f8e8fbf0d9ba9c47ff8d75019bd39a
Author: David Disseldorp <ddiss at samba.org>
Date:   Tue Jan 10 18:21:42 2012 +0100

    spoolss: fix DPD_DELETE_ALL_FILES error return
    
    If DeletePrinterDriverEx is called with DPD_DELETE_ALL_FILES and files
    assigned to the to-be-deleted driver overlap with other drivers then an
    error is returned. Change the error code here to match Windows 2k8r2.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Signed-off-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit 29c97b7132ac316327123f200a71e70317b2dbb9)

commit dc29cb3cbd94885c10fc797db68a823bf8a9cbfa
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sun Jan 22 21:22:24 2012 +0100

    WHATSNEW: Add more changes since 3.6.1.
    
    Karolin
    (cherry picked from commit f71b7a83c4cc3d10085ed1b7db29e222a4a9f743)

commit d419d614056ce7427f94c121c80bdc3d8d21b28e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sat Jan 21 22:17:42 2012 +0100

    WHATSNEW: Start release notes for 3.6.2.
    
    To be continued...
    
    Karolin
    (cherry picked from commit 3ea8d8acaefaadd2d3888bec1ef148b7242aaccf)

commit 798461a598609346e90376120c8d5c38f27f1a11
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Jan 21 21:34:06 2012 +0100

    [PATCH] s3: improve the code in the AES encryption.
    
    Remove looping replace them by memcpy.
    
    Fix bug #8674 (Buffer overflow in vfs_smb_traffic_analyzer).
    .
    (cherry picked from commit 0971582873f90bb592355fb53171d09a8ff3012e)

commit 9bea09193bf86b73bccc9c8b0bde6a19d1ac59be
Author: Jeremy Allison <jra at samba.org>
Date:   Sat Jan 21 21:16:19 2012 +0100

    s3: Fix bug #8674.
    
    Buffer overflow issue with AES encryption in samba traffic analyzer.
    (cherry picked from commit bb38a79656b6ddee01327c328435043a7d0a112b)

commit 5effeb2fa6a4f293a1c45b80496b30d76539be80
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 10 13:49:03 2012 -0800

    Third part of fix for bug #8673 - NT ACL issue.
    
    (Not needed in master as this code has changed). Ensure we set a temp
    access mask before calling open(O_RDONLY|O_DIRECTORY) on the directory.
    (cherry picked from commit 6b72809b7488cc530f47ad08dfde215627681cf6)

commit 713e10664603c9f38dabe65c8b380e7acc90d294
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 10 13:48:18 2012 -0800

    Second part of fix for bug #8673 - NT ACL issue.
    
    Ensure we process the entire ACE list instead of returning ACCESS_DENIED
    and terminating the walk - ensure we only return the exact bits that cause
    the access to be denied. Some of the S3 fileserver needs to know if we
    are only denied DELETE access before overriding it by looking at the
    containing directory ACL.
    (cherry picked from commit 28834ee4fcfc204fa9a88459700fed212a1e9fce)

commit cf5011595c1307bc96b475207b70300598c449a4
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 10 13:41:55 2012 -0800

    First part of fix for bug #8673 - NT ACL issue.
    
    Simplify the logic in the unlink/rmdir calls - makes it readable
    (and correct). Add some debug.
    (cherry picked from commit d40006aa7f8a594273a9d0ad1fa1a87ae7b1ebb0)

commit f6a6b15efcd6ff3befec2fd3780d7a35178b6dc1
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 16 15:50:58 2011 -0800

    Third part of fix for bug #8663 - deleting a symlink fails if the symlink target is outside of the share.
    
    can_access_file_acl() - we can always delete a symlink.
    can_delete_file_in_directory() - We don't need to do another STAT call
    here, we know smb_fname->st is in a valid state.
    smbd_check_open_rights() - we can always delete a symlink.
    (cherry picked from commit c6bd2aa768ebf4308c53d057bc1db7adc2b67705)

commit b0099de477a8f507e17e6221db8da4ca44a37294
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 16 15:37:07 2011 -0800

    Second part of fix for bug #8663 - deleting a symlink fails if the symlink target is outside of the share.
    
    Ensure we use UCF_UNIX_NAME_LOOKUP flags on filename_convert()
    when doing a restricted set of infolevels in trans2setfilepathinfo().
    (cherry picked from commit cb5f2b3f9d5710ba66182e45bf8380c2f37b4190)

commit 92b8b043f1491541dfad06cc9e00a66dcaf4683a
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 16 15:35:55 2011 -0800

    First part of fix for bug #8663 - deleting a symlink fails if the symlink target is outside of the share.
    
    Remove two unneeded check_name() calls. They have already been done
    in order to get here.
    (cherry picked from commit 8799e63b3859502e724cb870c954a0c03ce860e2)

commit 50336617279641fc980ea08a8d9f75713b6d2719
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 18 12:38:14 2012 -0800

    Fix bug 8710 - connections.tdb - major leak with SMB2.
    
    Ensure the cnum used to claim the connection for SMB2 is the
    id that will be used for the SMB2 tcon. Based on code from
    Ira Cooper <ira at wakeful.net>.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed Jan 18 23:14:32 CET 2012 on sn-devel-104
    (cherry picked from commit 39c627b60754bd89c419b2d7e32d32c7a9af5a11)
    (cherry picked from commit a455a63eaf84024f79922e95a740bf3443f37954)

commit 2dcf2267cb21e79380b8fc7f32b44463b3173cec
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 16 15:53:46 2011 -0800

    Fix bug #8664 - Renaming a symlink fails if the symlink target is outside of the share.
    (cherry picked from commit 6e77eac8f21925460e3b1946c2c22f6eff296322)

commit 9f700b8c346380bfe5080a49bf568cd1d6cf24d3
Author: David Disseldorp <ddiss at suse.de>
Date:   Fri Jan 13 13:51:22 2012 -0800

    idl: add to_null property
    
    to_null specifies that character conversion should only occur until the
    null pointer in an array based string.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Sat Jan 14 00:51:54 CET 2012 on sn-devel-104
    
    The last 5 patches address bug #8606 (Intermittent print job failures caused by
    character conversion errors).
    (cherry picked from commit c92513e218432ba3fb4afe6e93c8c1fc8f684368)

commit acb826038488fe8850fa227917868d9e03f4c00e
Author: David Disseldorp <ddiss at samba.org>
Date:   Wed Nov 23 02:03:48 2011 +0100

    idl: add to_null attribute to the spoolss devicename array
    
    OpenPrinterEx requests have also been observed in the wild carrying
    non-utf16 garbage after the device mode devicename field null
    terminator.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 90f3708135ef6573997417bd8e53191df78519c2)

commit f83cd0ae61ae4d5939c4e0904072f2860445294e
Author: David Disseldorp <ddiss at suse.de>
Date:   Sun Nov 13 20:40:56 2011 +0100

    idl: add to_null attribute to the spoolss formname array
    
    OpenPrinterEx requests have been observed in the wild carrying a device
    mode formname "A4" followed by non-utf16 garbage after the null
    terminator. Such requests currently fail during unmarshalling in the
    ndr_pull_charset() codepath, causing intermittent print job failures.
    
    This change ensures that garbage after the device mode formname null
    terminator is not processed in unmarshalling.
    
    https://bugzilla.samba.org/show_bug.cgi?id=8606
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 219d8c916fd890ca4b4eae77abd5a651aa37e4ff)

commit a2fa0c0c90913a8a0b73d8785435f193f03e1e43
Author: David Disseldorp <ddiss at suse.de>
Date:   Fri Jan 13 16:32:59 2012 -0800

    ndr: add ndr_pull_charset_to_null()
    
    The same as ndr_pull_charset(), however only perform character
    conversion on bytes prior to and including the null terminator.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit aa8fbd5005c06dfd0b5ee2865c49eab285f57e62)

commit de9aa675395493e592841ef4a94585f852bc2bff
Author: David Disseldorp <ddiss at suse.de>
Date:   Sun Nov 13 20:39:58 2011 +0100

    idl: add parser for the to_null property
    
    Compile into a ndr_pull_charset_to_null call.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit ec05a11c362f0aa4875c8dd3cfb853d0fae84c4c)

commit 531a182b552fa74d4a07250227897390ac0e3403
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 6 16:10:55 2012 +0100

    s3-libads: fix malloc/talloc mismatch in ads_keytab_verify_ticket().
    
    Guenther
    
    Fix big #8692 (ads_keytab_verify_ticket mixes talloc allocation with malloc
    free).
    (cherry picked from commit 6da7abe87db15d260db807643a25a96fc05e5ad9)

commit 5950aa455eab5a5305897eb67a4a1bcfeb10b409
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Nov 10 14:43:55 2011 +0100

    libcli/cldap: fix a crash bug in cldap_socket_recv_dgram() (bug #8593)
    
    After a calling any wrapper of tevent_req_notify_callback(),
    e.g. tevent_req_nterror(), tevent_req_done(), tevent_req_nomem(),
    a function has to return immediately otherwise it is very likely to
    crash.
    
    metze
    
    (similar to commit 17f1a97a614db4ed8292544988cb6a6cf56621d8)
    (cherry picked from commit 740a001971bab647c1ab129b3dd2fbccaddc4e7b)

commit 33b160306c7e79658034465cce2391cf9af90481
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Dec 23 14:45:45 2011 +0100

    s3:lib/ctdbd_conn: try ctdbd_init_connection() as root (bug #8684)
    
    ctdbd_traverse is only called if the main db_context is already
    open. So if we could get to information via dbwrap_fetch,
    we should also be able to traverse.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Dec 23 18:19:14 CET 2011 on sn-devel-104
    (cherry picked from commit 4a1895eb9921ad533910d08823c2814c470875fd)
    (cherry picked from commit ff4e1df575a3d7eb484b31d6afe46825ba418981)

commit 9f07ef2249dc21eab37cd5888623e6edc84b2b59
Author: Björn Baumbach <bb at sernet.de>
Date:   Fri Nov 18 18:54:56 2011 +0100

    s3-printing: fix migrate printer code (bug 8618)
    
    Removed path from driver files.
    We only need the basenames.
    (cherry picked from commit d61993043fcb7676a58658476421f5f4ff1a3fea)

commit cc2ba64e2182d6e8ff27e3c459574e8055356b6e
Author: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Date:   Wed Jan 4 11:09:54 2012 -0800

    Fix bug #8686 - Packet validation checks can be done before length validation causing uninitialized memory read.
    (cherry picked from commit 24ac26ddfd9ee8841d1984e710a4dfe535b9abcf)

commit 9d0ef461015d52012e64ca769e71661957d5dd02
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jan 5 13:54:29 2012 -0800

    Fix bug #8687 - net memberships usage info is wrong
    
    Typo in usage.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Jan  6 00:30:20 CET 2012 on sn-devel-104
    (cherry picked from commit 0453544900ef2ebff7a3c677d4048ef530713b64)

commit dacc8370ae2be513fbddb2e620d7a9dabd177ed8
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Nov 21 18:19:43 2011 +0100

    s3-libsmb: Don't duplicate kerberos service tickets.
    
    This fixes bug #8628.
    
    Each time we do a client connection. Each time we call to function to
    get the service ticket from the cache we duplicate it. So with each
    connection we end up with one or three duplicated tickets.
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Thu Dec 15 19:30:42 CET 2011 on sn-devel-104
    (cherry picked from commit d0330c7dd64b320cd86e2341b31da6be81ba829b)
    (cherry picked from commit 60cb113d98d98200b1d8b279591c930e6b0d1857)

commit 0ba828c25bf0107c14b47def830405b8848e6a55
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 30 21:19:08 2011 -0800

    Final part of fix for bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write.
    
    The code to set a DOS error on short writeX return is amazingly
    legacy code, and also breaks the reply as fixup_chain_error_packet()
    enforces a 2-byte wct on any reply where smb_rcls != 0.
    
    Found in testing by Andrew Bartlett. Thanks Andrew !
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Sat Dec 31 08:05:35 CET 2011 on sn-devel-104
    (cherry picked from commit e39df67669f61056692736db9c8dc16fbf2c3624)
    (cherry picked from commit 627f57f0714f257c6082b21447d122935c6e92e2)

commit b5b1068194ca3126f8b7a5901c6fad4cf334606a
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 30 20:45:10 2011 -0800

    Third part of fix for bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write.
    
    Fix default_sys_recvfile() to correctly cope with
    short writes. Return the amount written. Return
    -1 and set errno if no data could be written.
    (cherry picked from commit 5e6263960aaf1a5f9993cb7bb5646d36ff92b9cc)
    (cherry picked from commit ec9b07e84e806705e22f0cf2eb527fed14efac55)

commit 41b0d21a010914ebbce59a6c4d8d2457106bb3d4
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 30 20:23:00 2011 -0800

    Second part of fix for bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write.
    
    Split out the functionality of drain_socket() into a separate
    function from default_sys_recvfile().
    (cherry picked from commit a5715420e37b98038fe8f2c3028e4c6938400eed)
    (cherry picked from commit 7924e459b6677ba3500afff4b78f797e1e0ad83d)

commit bbaf2909e7295fe1e4d91d3d5c485dec1cff4531
Author: Jeremy Allison <jra at samba.org>
Date:   Sat Dec 24 21:12:09 2011 -0800

    Fix bug #8679 - recvfile code path using splice() on Linux leaves data in the pipe on short write
    
    Bug found and fix suggested by Andrew Bartlett.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Sun Dec 25 07:46:38 CET 2011 on sn-devel-104
    (cherry picked from commit eb617374a673bb1189dd9b6bccbf3f1d9fb91010)
    (cherry picked from commit b3f344b5b52096715eb5670b146f477a67af8245)

commit 5aa7fe1079ba159b19f995a1acf6b445af80829c
Author: Masafumi Nakayama <MASA23 at jp.ibm.com>
Date:   Wed Nov 2 10:35:19 2011 +0100

    s3-cli: fix bug 563, >8GB tar on BE machines
    
    Borrows on existing patches proposed by Craig Barratt and Brad Ellis.
    
    Signed-off-by: David Disseldorp <ddiss at suse.de>
    
    Autobuild-User: David Disseldorp <ddiss at samba.org>
    Autobuild-Date: Tue Jan  3 18:31:28 CET 2012 on sn-devel-104
    (cherry picked from commit 909056a2daacd961b40158b86bc117650a897054)
    (cherry picked from commit ab62ee622358362d4d2b16c7fec9a1f2cf7b8d8d)

commit bd206fbad82a9158c9868054903872ea58c26a95
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jan 3 16:55:25 2012 +0100

    s3-winbind: Fix segfault if we can't map the last user.
    
    This fixes bug #8678.
    
    The issue is caused by bug #8608.
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Wed Jan  4 18:30:53 CET 2012 on sn-devel-104
    (cherry picked from commit b9d208bdaa9da2a5ae534481865efc881b851b01)
    (cherry picked from commit 23db6e7cf65bdd3974a4857dda0be6ad7d758b9a)

commit c30ce0bae6d5b29f31b5172ace185fccf9b28a12
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jan 3 16:54:39 2012 +0100

    s3-winbind: Move finding the domain to it's own function.
    
    This the first part to fix bug #8678.
    (cherry picked from commit 5075e565684627dfbd23f715da344b4365351ccb)
    (cherry picked from commit 2fca06a63d47619f2b6902b1c8601021843c4b95)

commit 45c5b631eb6e7789e399f13b426b7d60b9d89653
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 2 10:55:40 2011 -0800

    Fix bug #8644 - vfs_acl_xattr and vfs_acl_tdb modules can fail to add inheritable entries on a directory with no stored ACL.
    
    If referring to an fsp sbuf can be left as an uninitialized variable,
    causing the 'is_directory' variable to be false when it should be true.
    (cherry picked from commit 16c0d52842386fc2ebf975166b57b888d36796c5)

commit 47af65ccf3bacee7cf9619bacc4037162b919ac7
Author: Björn Jacke <bj at sernet.de>
Date:   Sat Dec 10 13:53:42 2011 +0100

    s3/doc: document the ignore system acls option of vfs_acl_xattr and vfs_acl_tdb
    
    Autobuild-User: Björn Jacke <bj at sernet.de>
    Autobuild-Date: Sat Dec 10 15:30:46 CET 2011 on sn-devel-104
    (cherry picked from commit f452add2231906742c9fd119371cd4fd81a1bdd6)
    
    Fix bug #8652 (vfs_acl man pages miss "ignore system acls" option).
    
    Fix bug #8652 (vfs_acl man pages miss "ignore system acls" option).
    (cherry picked from commit ceeab5c66cef2c5aa7931329a9976c8173f44467)

commit 7ec243b526f85eb41a4bfaa083e878251119d2e3
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Nov 17 22:24:24 2011 +0100

    s3: Fix bug 8371
    
    ndr_set_flag or's in the given flag (ALIGN4). At this point, ndr->flags
    contains NOALIGN, which will persist. In ndr_push_DATA_BLOB NOALIGN overrides
    everything else, so that the ALIGN4 is not respected.
    (cherry picked from commit 6cb605364e83fe0c5562c9b0920408c697e4fc3e)

commit a72e1fa3a4c0c1cdf793b9221d1a60af6087690c
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Dec 5 12:33:25 2011 -0800

    s3-winbind: Add an update function for winbind cache.
    
    With 57b3d32 we changed the format for the winbind cache database and
    the code deleted the database for the upgrade. As this database holds
    also cached credentials, removing it is not an option. We need to update
    from version 1 to version 2.
    
    Fix bug #8643 (A Samba update to 3.6 deletes the winbind cache with cached
    credentials).
    (cherry picked from commit df616e928e08646bbc234af673a496117535c6d8)

commit 62a4f81423b7699f1f887d58eaa27783df2e5827
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Nov 30 18:51:27 2011 +0100

    s3: Attempt to fix the vfs_commit module
    
    This bug went in in 2007. I wonder how much this module is actually used....
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Wed Nov 30 21:46:09 CET 2011 on sn-devel-104
    (cherry picked from commit b638abf70a3c9b2815344454946c0931295551be)
    (cherry picked from commit 33a8e161401b889feca19b2bb9222509cf77c37d)

commit d6c51ce37602d3b6768ef561ad35d8632df395a5
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 29 11:55:39 2011 -0800

    Fix bug 8631 - POSIX ACE x permission becomes rx following mapping to and from a DACL Reported by David Disseldorp. Fix based on a patch by David.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Tue Nov 29 22:32:27 CET 2011 on sn-devel-104
    (cherry picked from commit 6bf97ea3bc70745f64f82251cbce443f2637c703)
    (cherry picked from commit 28fa8d8d777f3da40fde2fb57cd06659f76cf658)

commit ebbe03b544c13ccf14fe63f4b74e1e4d69a744ca
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date:   Mon Nov 14 07:47:38 2011 -0800

    Improve configure.in so it can be used outside the Samba source tree.
    
    Autobuild-User: Richard Sharpe <sharpe at samba.org>
    Autobuild-Date: Thu Nov 17 07:00:38 CET 2011 on sn-devel-104
    (cherry picked from commit f50aa988c201c2fe78e467f1a419bedc741e1d31)
    
    Fix bug #8607 (The configure.in in examples/VFS does not easily allow building
    modules outside the Samba source tree).
    (cherry picked from commit 7db7ea684a17b70ecae31c70c1b2e647ea0fafa1)

commit b329caa0e51431b51482232c4c785ecacff1b03a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Nov 18 08:40:18 2011 +0100

    s3:libsmb: only align unicode pipe_name (bug #8586)
    
    metze
    (cherry picked from commit 48bcb8c846532ccd5489ef705182fb81c5278b04)
    (cherry picked from commit 10f45157037edc528926ae7dc4a40909566c6480)

commit 364175379a7909d8cb0d0eb2f9512298bd4f4b35
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Nov 14 10:01:31 2011 +0100

    s3-winbind: Don't fail on users without a uid.
    
    This fixes bug #8608.
    
    If you join samba with idmap_ad backend to an AD. When you try to
    enumerate users with 'getent passwd' and the user doesn't have a uid
    set, then getent is aborted cause of NT_STATUS_NONE_MAPPED. If we can't
    map a user we should not stop but continue enumerating users.
    
    This normally happens with the default user 'krbtgt' with idmap_ad but
    could also happen with other backends.
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Tue Nov 15 16:52:04 CET 2011 on sn-devel-104
    
    (backported from commit 10b285ccc29b106f164a6c18116e237634867717)
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit a64f88f4e97f0f9c006fe6f0cefc0a61efc1ca98)

commit 2c858e95191854dbff51c7173f31cc1b667fac9e
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon May 9 17:43:45 2011 +0200

    lib/util/ Fix crash bug caused by gfree_debug()
    
    The issue is that we should reset the debug_num_classes to 0 when we
    un-initialise the debug system.
    
    Andrew Bartlett
    (cherry picked from commit 5db0cd55d4db9cc71f32dc0097e2f014c22967bc)
    
    Fix bug #8623 (Crash when trying to browse samba printers).
    (cherry picked from commit 3651471288ebd05108c9cd7f1bdbb844829244fb)

commit ba6059891f876288fc53c6be70f6e479102faad8
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Nov 18 13:40:17 2011 +0100

    s3: allow to set TCP_NODELAYACK socket option on AIX (#8616)
    
    this is the AIX way to disable delayed ACKs, the same like TCP_QUICKACK on
    Linux
    
    this is a backport of 383a918322c1edd1977fdbce19e52e8c8e6ffac1
    (cherry picked from commit d8091581f7e55a8147c9ec5e8a30481596093d27)

commit 5d9035608c618523542ec3e5e29fc8469dd0d196
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Nov 17 21:23:09 2011 +0100

    s3/packaging: Fix rpm build issues on RHEL4.
    
    Second part of a fix for bug #7705 (RHEL samba.spec broken - and fix).
    Based on patches of Jason Haar and Daniël van Eeden. Thanks a lot!
    
    Karolin
    
    Autobuild-User: Karolin Seeger <kseeger at samba.org>
    Autobuild-Date: Fri Nov 18 22:13:06 CET 2011 on sn-devel-104
    (cherry picked from commit 1d471ee393b0a0c1f9cc4256217acabcd98a5dbf)
    (cherry picked from commit b0e5fb69df8b66544afc29d0b3dac5454d04fe3e)

commit 05fe61923f3d3e7ca42697ee309fe23bcc1805c9
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Nov 17 21:02:30 2011 +0100

    s3/packaging: Fix rpm build issues on RHEL.
    
    Fix bug #7705 (RHEL samba.spec broken - and fix).
    Based on patches of Jason Haar and Daniël van Eeden. Thanks a lot!
    
    Karolin
    
    Autobuild-User: Karolin Seeger <kseeger at samba.org>
    Autobuild-Date: Thu Nov 17 23:05:28 CET 2011 on sn-devel-104
    (cherry picked from commit 32e825d60df26fa1d4cf5c8c7cb37ca0523847ca)
    (cherry picked from commit f89cdef51633402006dcad17b49e596a41905a40)

commit 44489d174a64c3e0ff0133752a3cedb7f7139b49
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 3 14:30:11 2011 -0700

    Fix bug #8562 - talloc: double free error.
    
    Ensure we don't access an undefined pointer.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Nov  4 00:09:46 CET 2011 on sn-devel-104
    (cherry picked from commit 767c54d8dd9596718579699398392ae234b40aa2)
    (cherry picked from commit 5935630fcd15e2618b854fa3c78f3e500690cf35)

commit 0a7ff283dcef5adbf9e6f5e8998c9061c4dbc1b3
Author: Matthieu Patou <mat at matws.net>
Date:   Fri Oct 21 16:11:41 2011 +0200

    libcli-cldap: avoid the case local == remote == NULL (cherry picked from commit 4d2d33ee09941ddb211e21788c01d886730224c2)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    The last 2 patches address bug #8600 (cldap doesn't work over ipv6).
    (cherry picked from commit d8bc1584df47673ba7f6933af178f8669a61262b)

commit 0cfe6c010fc59e09586cc69ce776d2412abb32b3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Oct 21 09:49:30 2011 +0200

    libcli/cldap: make sure the local and remote address family matches
    
    metze
    
    Signed-off-by: Matthieu Patou <mat at matws.net>
    (cherry picked from commit 66530e91498cfa77a9d2e3a031f8a2e1c5ee6804)
    (cherry picked from commit b301e0e199ec91bdf07a5022e37181d8e570ef3d)

commit 9f0790048416020a3aaa8c0ca79e683dee159c66
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Nov 11 02:10:00 2011 +0100

    s3:libsmb: consistently use state->size in cli_write_andx_create() (bug #5326)
    
    Otherwise we may get unexpected results.
    
    This is a fix that was missing in commit 95595dd93fd04999fcf56ecaab7c29b064d021f8
    (s3:libsmb: fix cli_write_and_x() against OS/2 print shares (bug #5326))
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Nov  9 10:13:32 CET 2011 on sn-devel-104
    (cherry picked from commit 4b31c4273c45faa639445614061f3da548eb8505)
    (cherry picked from commit b5e1b792366dc769389353cdbb63466f6867efb0)

commit 9cb4a9a184ec9ed6e64cd524ea79fecf303e0fc5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 8 08:25:16 2011 +0100

    s3:libsmb: fix cli_write_and_x() against OS/2 print shares (bug #5326)
    
    Print shares doesn't support CAP_LARGE_WRITEX, while it's negotiated
    by the file server part.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Nov  8 17:01:36 CET 2011 on sn-devel-104
    (cherry picked from commit 95595dd93fd04999fcf56ecaab7c29b064d021f8)
    (cherry picked from commit 2ce6d51713bb47059814c720307f337fd380fc1c)

commit dda4a8b1f05f4fd843e4fde930c1edf926e31870
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 15 11:27:56 2011 -0800

    Ensure we correctly calculate reply credits over all returned
    SMB2 replies, and do as Windows does and return the total in the
    last SMB2 reply. Fixes an issue found by Christian M Ambach <christian.ambach at de.ibm.com>
    (and thanks to Christian for the initial patch this was based on).
    (cherry picked from commit 65566dfa8629136eaf0dc1491502dc651d1a4858)
    
    Fix bug #8614 (SMB2: not granting credits for all requests in a compound
    request).
    (cherry picked from commit 35564365f49fda6505d6e350fa8b0e5ef1a4e33c)

commit d384873d8841ee3afce1bd3f37c99a88436b9a08
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Nov 10 12:20:20 2011 +0100

    s3:smb2_flush: outbody only needs 4 bytes
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Nov 14 10:01:30 CET 2011 on sn-devel-104
    (cherry picked from commit 72cabbbe50a36986dde823f0ba60abf9052c535a)
    
    Fix bug #8579 (smb2_flush sends uninitialized memory).
    (cherry picked from commit 5336e301db8f34325338d2b3bcef2cb614e6dddd)

commit 64b0987a6119633806b864135e9018f58a1e5aa9
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 15 15:42:50 2011 -0800

    Fix bug #8561 - Password change settings not fully observed.
    
    Based on commit 3ede4ffe969f806ba2363b62c09673c32a4ec296 in master
    (with a change to set the header prototype in the correct file).
    (cherry picked from commit fc394c33e3c201b0db620d9c46afedf852cec9a8)

commit 5d104ff14861450ca61d17309ddc361901bd2634
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 8 17:50:43 2011 +0100

    s3:smb2_server: grant credits in async interim responses (bug #8357)
    
    The first fix for bug #8357 intruduced a regression, so that we no
    longer grant credits for real async interim responses with
    STATUS_PENDING.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Nov  9 11:56:29 CET 2011 on sn-devel-104
    (cherry picked from commit ffbd1ed2797616226a7987efd4b4dd4275c8c9d0)
    (cherry picked from commit ec72b6366701952e7d7574f22997b59858f887b0)

commit 23067abc20e25c0aa713972d0fac6bf48fb1c482
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Nov 9 16:04:09 2011 +0100

    s3:smbd: don't limit the number of open dptrs for smb2 (bug #8592)
    
    This fixes a crash bug that is triggered, when a client has more than
    256 directory handles with searches.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Nov 10 14:08:14 CET 2011 on sn-devel-104
    (cherry picked from commit 22ddbb50534aa73240a171732d4ac1fa884fa412)
    (cherry picked from commit b3f98fc0366cd27c9e043591c70e283423fcd77e)

commit ffa8cef015070dc7c97c597a24f26cba9836a339
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Nov 9 15:59:22 2011 +0100

    s3:smbd: fully construct the dptr before allocating a dnum in the bitmap
    
    metze
    (cherry picked from commit 39bb5a62977261d0926f56b792aacaa5e772ff6f)
    (cherry picked from commit 798b63addf6aaecbe5b6241975f78103a56b1442)

commit 2ae3ef7864b088a0ea1932f43f2cb1966f69b4cf
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Nov 10 10:39:34 2011 +0100

    s3:smbd: avoid string_set() in dir.c
    
    And do some more error checks.
    
    metze
    (cherry picked from commit 7644547a5523b77bd49d9a5d979d5e4939153401)
    (cherry picked from commit 785c0741af53cb142fc3ec7e55d999477d44d9bc)

commit ab829518c46392536ee7ba09e9fdbe9df8ea8b7d
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 8 16:00:10 2011 +0100

    samr: filterModuleName is a lsa_String in userPwdChangeFailureInformation.
    
    The entire marshalling of samr_ChangePasswordUser3 broke with c2685cdedb430ae75a94e86f34484292b4269363.
    
    Matthias, the bad effect of this change was that actually all failed password
    change attempts will always return NT_STATUS_OK because the last 4 bytes (the
    resulting status code) were not marshalled anymore.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Nov  9 00:41:13 CET 2011 on sn-devel-104
    (cherry picked from commit 8a18edf1c2d553105cfcadec4d892e4e5a0fdba1)
    
    The last 2 patches address bug #8591 (samr_ChangePasswordUser3 IDL incorrect).
    (cherry picked from commit 4d52675716997057941390c5711850c36786ef15)

commit 65721f9c3d7e65606f575a84e9205dadf7547f2c
Author: Günther Deschner <gd at samba.org>
Date:   Tue Nov 8 15:58:34 2011 +0100

    s4-smbtorture: demonstrate how broken our samr_ChangePasswordUser3 marshalling is...
    
    Guenther
    (cherry picked from commit bfe084bd8bbdfa0a0fa31521584f3bc142785fb8)
    (cherry picked from commit 9c7925120a06a3511f88d768fd9c459023d3c0fe)

commit 7cdaf23f3f1a25b4492be0ebd24b8a733c582eb6
Author: Christian Ambach <ambi at samba.org>
Date:   Thu Oct 20 18:53:02 2011 +0200

    s3:idmap_autorid: document allocation pool
    
    document the need that excessive use of local users/group might
    require increasing the rangesize
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Fri Oct 21 18:04:50 CEST 2011 on sn-devel-104
    
    The last 4 patches address bug #8444 (idmap_autorid does not have allocation
    pool).
    (cherry picked from commit a0cfd1983fae8b0090bcae36a11dad4531e48f49)

commit d5f6dcbfe27f42d1203e3cb2957464c9681a5269
Author: Christian Ambach <ambi at samba.org>
Date:   Thu Oct 20 18:44:48 2011 +0200

    s3:idmap_autorid: add an allocation range to autorid
    
    this is needed to allocate gids for BUILTIN\Users and
    BUILTIN\Administrators and for local users/group that
    admins might want to create
    
    autorid will now allocate one range for this purpose
    and can so give out as many uids and gids as the
    configured rangesize allows
    (cherry picked from commit a98095601dc585a6c49813399466a455c43fc0fc)

commit 712d1a0d3cb82ccc0fabf02f42c8a2b258fb748d
Author: Christian Ambach <ambi at samba.org>
Date:   Thu Oct 20 18:39:30 2011 +0200

    s3:idmap_autorid: move HWM initialization into a function
    
    we will need some more HWM soon, so move out initialization and
    optimize the logic using the new interface of dbwrap_fetch_uint32
    (cherry picked from commit 31593bcd74f4063217190012a83e1003e29fdba7)

commit f15f3f027d4888affdb4c7575e87e14a7a09b80a
Author: Christian Ambach <ambi at samba.org>
Date:   Thu Oct 20 18:22:19 2011 +0200

    s3:idmap_autorid: use strings as parameter for range allocator
    
    this prepares for allocation of non-domain ranges that cannot be
    expressed by a SID (e.g. an allocation pool)
    (cherry picked from commit 188a12e1df2a5a3ae39cb2e25c87ae2093a62853)

commit 876bf1c29c4e6ea7ec7018c01f12b574d80770d2
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Nov 2 16:53:27 2011 +0100

    systemd: Fix dependencies.
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Fri Nov  4 12:36:04 CET 2011 on sn-devel-104
    (cherry picked from commit 4f3e86f62398218c454b979aaad75c7d7d3d8546)
    
    The last 3 patches address bug #8575 (Add systemd files to 3.6).
    (cherry picked from commit 81823a0e9d6cadd21e14c9f9ce16cc7ebf849e90)

commit f1ea6d6ecdf74d90a4313c0744dc9ca1c214e20e
Author: David Disseldorp <ddiss at suse.de>
Date:   Thu Nov 3 12:54:00 2011 +0100

    pkg: add comments to the systemd sysconfig file
    
    Autobuild-User: David Disseldorp <ddiss at samba.org>
    Autobuild-Date: Thu Nov  3 15:11:27 CET 2011 on sn-devel-104
    (cherry picked from commit 0f61eb5e299abfa0ffe5e0dd92a40e582021a5b2)
    (cherry picked from commit a29a1be90608541c1f9f0142bb5b05965a2c4a34)

commit f2863f8e4cc4ce7639cc855158a8c803ced0c2a7
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Oct 27 17:11:19 2011 +0200

    Add systemd service files.
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Fri Oct 28 11:34:27 CEST 2011 on sn-devel-104
    (cherry picked from commit 7d7ba3ba40895090d9bd791f210f89c5d5d2582e)
    (cherry picked from commit 7c2ec923a1b904ceec7d5c18abb58d498ae201f4)

commit 930dd608db02281353ffd06d7193460a0d7060b1
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Nov 4 12:52:44 2011 +0100

    s3:libsmb: the workgroup in the non-extended-security negprot is not aligned (#8573)
    
    I've tested the fix against NT4 sp6a, W2K sp4, W2K8R2 and Win8pre0.
    
    metze
    (similar to commit aea76a3aaa7ea52f563e7bc8a8ed60d9651f9e34)
    (cherry picked from commit d0272d6ff1e2e33d710d5bee25a2781c67edc3a5)

commit aae6ea661dee1ff040bd3dc4d81912f614b5e245
Author: Björn Baumbach <bb at sernet.de>
Date:   Mon Nov 7 14:24:40 2011 +0100

    s3-wafbuild: Fix inotify detection (bug 8580)
    
    Enable inotify if sys or kernel inotify is available.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Nov  7 16:28:38 CET 2011 on sn-devel-104
    (cherry picked from commit b9e6c48678624ba5335d00906c558ea9e0086699)
    (cherry picked from commit 8929b72433aea584f76519b0eabdab8b6423f5cf)

commit df819dd8291f57fabe21c0bf3b31573075686544
Author: Björn Baumbach <bb at sernet.de>
Date:   Mon Nov 7 12:42:28 2011 +0100

    s3-build: Fix inotify detection (bug 8580)
    
    Enable inotify if sys or kernel inotify is available.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 846809853acd53a733fa6057436c6e51843d8fab)
    (cherry picked from commit 5efb2cecf80bf7911755e583de59f4a015b864e8)

commit 36d7235e4fa7f89187b6733084726c983c4c7b84
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Nov 1 10:55:17 2011 -0700

    s3:smb2_server: FLAG_CHAINED means we always use the last session_id and tid
    
    Based on master commit 91648aeb6409787c7766943225f5c7a9c695aa0b.
    
    metze
    
    The last 4 patches address bug #8560 (SMB2 doesn't handle compound request
    headers in the same way as Windows).
    (cherry picked from commit 2971e74fd522998d30b2923a2a308d8e28c04aa9)

commit ca3572e0bad37209d5cc0266a1eacbf74d6fa950
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Aug 30 11:48:16 2011 +0200

    smb2_constants: add SMB2_HDR_CREDIT_CHARGE
    
    SMB2_HDR_EPOCH was never used and SMB 2.10 uses it as
    SMB2_HDR_CREDIT_CHARGE.
    
    We keep SMB2_HDR_EPOCH as alias for now, until all callers
    are fixed.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Aug 30 23:49:56 CEST 2011 on sn-devel-104
    (cherry picked from commit 480a031c5b9a2ffe1e03e3fcb197e526e6d69e72)
    (cherry picked from commit 7d297fa7ab21d265bdb9610068f4b6169ea0a5f9)

commit 72fb66028a173305ce948a987a3bc88de509e975
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 31 15:15:09 2011 -0700

    s3:smb2_server: don't reset the tid and session id in the out hdr of compound requests
    
    Windows also leaves tid (0xFFFFFFFF) and session id (0xFFFFFFFFFFFFFFFF)
    as the client requested them.
    
    Based on commit 8d07d7148bf47ea14e62d39ed8a8cc4f1366810e from master.
    
    metze
    (cherry picked from commit ab81a8df620a2d7fcb3852834353a0300dcb9f45)

commit 8240b5dc9eff4cbd34443ae0d1faa1edbf37ace3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Oct 27 16:42:44 2011 +0200

    s3:smb2_server: echo the SMB2_HDR_CREDIT_CHARGE and SMB2_HDR_SIGNATURE fields
    
    Windows just echos back the given values by default.
    
    metze
    (cherry picked from commit c7d3b6b2c38711943910aebff72b0188b0c346db)
    (cherry picked from commit 3a9154c67647d209ad5300acfcf9d675d0a2e8e0)

commit bb18e26547177f0ba947e8a7094474d2ff626244
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Nov 4 17:34:48 2011 +0100

    s3:smbd increase a debug level
    
    logging disconnected clients with level 1 swamps the logs
    
    (This fixes Bug #8585 Disconnecting clients swamp the logs)
    (cherry picked from commit 0f836e532abcd7e24fd65d885a5b5c1d94ebefa1)

commit f00857fa3883ac0ae91cc29dfcecae8228fc533b
Author: Henry Wong <henry at stuffedcow.net>
Date:   Fri Nov 4 11:20:10 2011 -0700

    Properly fix bug #8384 - Windows XP clients seem to crash smbd process every once in a while.
    
    Ensure we correctly null out the referenced pointer when we decrease the ref. count.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Nov  4 21:12:13 CET 2011 on sn-devel-104
    (cherry picked from commit 51c86c8e67c3b026f49136f5b6743c279cc206d2)
    (cherry picked from commit cb6795bea659e884e23173960e68a2f970fc5dd3)

commit a0c80c5aba5a94b2632cc96fd28ac65462fde40a
Author: Günther Deschner <gd at samba.org>
Date:   Thu Nov 3 20:55:08 2011 +0100

    examples: Fix perl path.
    
    Fix bug #8176 (wall.perl example uses /usr/loca/bin for pat to perl binary).
    (cherry picked from commit 2bec3bd80fc16699dfe8cc6aa3afd97881b8bfe9)
    (cherry picked from commit b01b1faafe32fbb88739ae8aaaf9f2fe5e1dcdcf)

commit 6cbf3638d59fa20f7972d712de3b408f48d6ab34
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Oct 27 11:21:08 2011 +0200

    s3-netlogon: Fix setting the machinge account password.
    
    This bug has been found with uid wrapper.
    (cherry picked from commit bda9752b1036c4d4db76a526a79a091419bf757c)
    
    Fix bug #8550 (Calls inside netr_set_machine_account_password() to set the
    machine account password must be done as root).
    (cherry picked from commit 3b4268ff0929740a2845a02a5b6f2596ff31f7f9)

commit 6f3fda8c851b88c0898019609843e62a1adc3eb9
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 28 12:29:54 2011 -0700

    Fix bug #8548 - winbind_samlogon_retry_loop ignores logon_parameters flags.
    
    Fix confirmed by reporter.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Oct 28 23:04:47 CEST 2011 on sn-devel-104
    (cherry picked from commit f30f71c14a0b89dea296910ac9b92d3ae4016613)
    (cherry picked from commit 110ee604f5d632a38af4a61295f7100fcfbd1d0a)

commit 451d31d782a59405244634d310175046b21cbba3
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 21 18:08:46 2011 -0700

    Fix bug #8542 - smbclient posix_open command fails to return correct info on open file.
    (cherry picked from commit d27f5a277ef47c5ff94e402930680b37e8f4d592)

commit 8edfc0f3c6043b45754083df9520c36d35a16530
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 21 18:35:15 2011 -0700

    Third part of fix for bug #8541 - readlink() on Linux clients fails if the symlink target is outside of the share.
    
    Missed passing ucf_flags instead of hard coded flags in findfirst call.
    (cherry picked from commit 49d2a796bed0273327d8919755023c4dbd6d8232)
    (cherry picked from commit 074b9462e4b7b2b6e474566016e93a87c77e1599)

commit c4b6e73b406c4d89e03cb5b49bca52ef4dcefd9c
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 21 17:46:12 2011 -0700

    Second part of fix for bug #8541 - readlink() on Linux clients fails if the symlink target is outside of the share.
    
    The statcache has to do lstat instead of stat when returning cached
    posix pathnames.
    (cherry picked from commit 305d7d7f7d76e37d82ce6ac257f178ce654b26db)
    (cherry picked from commit 6529ac5424f75943b612daddaefb765b44aecdf7)

commit df549978366222fc0c775f7c5935a975fe5a2599
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 21 14:12:41 2011 -0700

    Fix bug #8541 - readlink() on Linux clients fails if the symlink target is outside of the share.
    
    The key is to only allow the lookup to succeed if it's a UNIX level lookup or readlink,
    but disallow all other operations.
    (cherry picked from commit d2ec9d20858b8e5256bf8339395c6f47793e0975)
    (cherry picked from commit a7d2815e97218c2b7eccbac25f78f2c2fae45a79)

commit 1f8ff6cc976007b540ec8458ab77a0eed8bc7709
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jul 25 16:12:45 2011 -0700

    Use existing ISDOT and ISDOTDOT macros.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Thu Jul 28 02:09:20 CEST 2011 on sn-devel-104
    (cherry picked from commit d82256ca119eb8315cc69ba725ba71c386caa901)
    (cherry picked from commit 99b4d6912570cc210035b2222ad57f4279792a2d)

commit 389e98a85975dd2b410d32ae96ccaf61f7b77ff4
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 26 15:03:23 2011 +0200

    s3-netapi: remove pointless use_memory_krb5_ccache.
    
    This breaks the ABI.
    
    Guenther
    
    See bug #7465 for more details.
    (cherry picked from commit 2970d44442c2e6e80fb18f5c669d347e5f5be62e)

commit 667b3ce9c438ce5b7f37c9cb032b39dab734e1f5
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Oct 20 21:39:38 2011 +0200

    s3:Makefile: make DSO_EXPORTS_CMD more portable (#8531)
    
    It sems like every not completely trivial sed expression should be tested with
    Solaris' sed.  Its regexp engine is way more limited than the one of GNU
    sed. Thanks to Michael Pelletier for finding this! This fixes bug #8531
    
    Autobuild-User: Björn Jacke <bj at sernet.de>
    Autobuild-Date: Thu Oct 20 23:15:05 CEST 2011 on sn-devel-104
    (cherry picked from commit 37be1df3d7534c2cc8e1e25614164c2178372b94)
    (cherry picked from commit 763ad499aa4423c5e68a75f20f2ba8ee967e5984)

commit 9a277d807f10f9fd457a8e9bb8302e41f0539640
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Oct 11 17:00:08 2011 -0700

    Add new contributing FAQ announcing acceptance of corporate (C).
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed Oct 12 03:46:41 CEST 2011 on sn-devel-104
    (cherry picked from commit bd01ae227bc567fd7953e446236364fc4d110a48)
    (cherry picked from commit f165b54828f451943b172b8d2d1bfd15f37b7fdf)

commit d8a80d819eeb2a6b475867a01fa7b6818fdb386c
Author: Brad Smith <brad at comstyle.com>
Date:   Wed Oct 12 04:23:58 2011 -0400

    Fix sys_fseek wrapper
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    
    Fix bug #8525 (Bug with sys_fseek() wrapper on *BSD / OS X).
    (cherry picked from commit 0f6b4b68db334028a5fa60c8615879a033286a4b)

commit 83006b7b3fddcfbe3a49d257e79c71739c7011ae
Author: Michael Adam <obnox at samba.org>
Date:   Thu Sep 29 18:06:56 2011 +0200

    s3:registry: fix the test for a REG_SZ blob possibly being a zero terminated ucs2 string
    
    1. catch data blobs with odd number of bytes (not an ucs2 string at all)
    2. test the right ucs2 character to be 0
       (prevent out-of bounds access/potential segfault)
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Sun Oct  2 01:26:05 CEST 2011 on sn-devel-104
    (cherry picked from commit 95bb2c23e6e9c52a1e34916dff05b1d306278bc6)
    
    The last 2 patches address bug #8528 (SEGFAULT from net registry export on not
    zero terminated REG_SZ values).
    (cherry picked from commit bc3af75ec9841753b5bfbcd04d9a412f7ee5c4b5)

commit 1185167c3f4c5fb59de704c307f79c26efa4ce95
Author: Gregor Beck <gbeck at sernet.de>
Date:   Tue Sep 6 09:24:10 2011 +0200

    s3:registry: reg_format: handle unterminated REG_SZ blobs
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit b9da4235566ffdd649d7b4a6ca05cecd02cfbd20)
    (cherry picked from commit 11287cec6a53717c7abc5a54c2607f8ffb33d8bb)

commit f56858191f7bb28004fed1e92c7f5e264b312259
Author: Frank Lahm <franklahm at googlemail.com>
Date:   Mon Oct 17 11:10:29 2011 -0700

    First part of fix for bug #8419 - Make VFS op "streaminfo" stackable.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Mon Oct 17 21:39:32 CEST 2011 on sn-devel-104
    (cherry picked from commit c3bdcab5161107be8155a7913d9cb325383a781d)
    (cherry picked from commit b8244184fe37da645f9544b68197707abe0d2ad3)

commit 6afaac7ebe4526c18174df9614de5e06e681b0a1
Author: Frank Lahm <franklahm at googlemail.com>
Date:   Thu Oct 13 15:41:53 2011 -0700

    Add support for VFS op streaminfo chaining in all relevant VFS modules.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Oct 14 03:26:06 CEST 2011 on sn-devel-104
    (cherry picked from commit 7a0b5d6fc51d5d212529e82e5ed8e21516bfbe27)
    (cherry picked from commit 7237535d10d657cac8c18af51648a12f2ab3309f)

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

Summary of changes:
 README.contributing                         |  120 +++++++++++
 WHATSNEW.txt                                |  143 ++++++++++++-
 docs-xml/manpages-3/idmap_autorid.8.xml     |    7 +-
 docs-xml/manpages-3/vfs_acl_tdb.8.xml       |   23 ++-
 docs-xml/manpages-3/vfs_acl_xattr.8.xml     |   23 ++-
 examples/VFS/configure.in                   |    5 +-
 examples/misc/wall.perl                     |    2 +-
 lib/util/debug.c                            |    2 +-
 libcli/cldap/cldap.c                        |   44 +++-
 libcli/netlogon/ndr_netlogon.c              |    2 +
 libcli/security/access_check.c              |    7 +-
 libcli/smb/smb2_constants.h                 |    3 +-
 librpc/idl/samr.idl                         |    2 +-
 librpc/idl/spoolss.idl                      |    4 +-
 librpc/ndr/libndr.h                         |    1 +
 librpc/ndr/ndr_string.c                     |   32 +++
 packaging/RHEL/samba.spec.tmpl              |   43 ++---
 packaging/systemd/nmb.service               |   12 +
 packaging/systemd/samba.sysconfig           |   14 ++
 packaging/systemd/smb.service               |   13 ++
 packaging/systemd/winbind.service           |   12 +
 pidl/lib/Parse/Pidl/NDR.pm                  |    9 +-
 pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm    |    6 +-
 source3/Makefile.in                         |    2 +-
 source3/client/client.c                     |    4 +-
 source3/client/clitar.c                     |   22 ++-
 source3/configure.in                        |    8 +-
 source3/include/smb.h                       |    1 +
 source3/lib/ctdbd_conn.c                    |    2 +
 source3/lib/filename_util.c                 |    2 +-
 source3/lib/netapi/netapi.c                 |   14 --
 source3/lib/netapi/netapi.h                 |    6 -
 source3/lib/recvfile.c                      |   75 +++++---
 source3/lib/system.c                        |    2 +
 source3/lib/util_sock.c                     |    3 +
 source3/libads/kerberos_verify.c            |    2 +-
 source3/libsmb/cliconnect.c                 |   25 ++-
 source3/libsmb/clikrb5.c                    |    5 -
 source3/libsmb/clireadwrite.c               |   21 ++-
 source3/libsmb/clitrans.c                   |   18 +-
 source3/modules/onefs_streams.c             |   17 +--
 source3/modules/vfs_acl_common.c            |   62 ++++--
 source3/modules/vfs_commit.c                |    2 +-
 source3/modules/vfs_default.c               |   25 +--
 source3/modules/vfs_smb_traffic_analyzer.c  |   19 +-
 source3/modules/vfs_streams_depot.c         |   18 +--
 source3/modules/vfs_streams_xattr.c         |   18 +--
 source3/passdb/pdb_get_set.c                |   38 +++-
 source3/passdb/proto.h                      |    1 +
 source3/printing/nt_printing.c              |   81 ++++----
 source3/printing/nt_printing_migrate.c      |   27 +++
 source3/registry/reg_format.c               |   19 ++-
 source3/rpc_server/netlogon/srv_netlog_nt.c |   15 ++-
 source3/rpc_server/samr/srv_samr_nt.c       |    2 +-
 source3/rpc_server/spoolss/srv_spoolss_nt.c |  305 ++++++++++++---------------
 source3/smbd/close.c                        |   10 +-
 source3/smbd/dir.c                          |   66 ++++--
 source3/smbd/file_access.c                  |   23 +-
 source3/smbd/filename.c                     |   45 +++--
 source3/smbd/globals.h                      |    2 +
 source3/smbd/nttrans.c                      |   10 +-
 source3/smbd/open.c                         |   46 ++--
 source3/smbd/posix_acls.c                   |    4 +-
 source3/smbd/process.c                      |   11 +-
 source3/smbd/proto.h                        |   14 +-
 source3/smbd/reply.c                        |   11 +-
 source3/smbd/service.c                      |   88 ++++++--
 source3/smbd/smb2_flush.c                   |    2 +-
 source3/smbd/smb2_server.c                  |   30 ++-
 source3/smbd/smb2_sesssetup.c               |   32 +--
 source3/smbd/smb2_tcon.c                    |   38 +---
 source3/smbd/statcache.c                    |   11 +-
 source3/smbd/trans2.c                       |   40 +++-
 source3/smbd/vfs.c                          |   15 ++
 source3/utils/net_groupmap.c                |    2 +-
 source3/winbindd/idmap_autorid.c            |  158 ++++++++++++---
 source3/winbindd/wb_next_pwent.c            |   69 +++++-
 source3/winbindd/winbindd_cache.c           |   96 ++++++++-
 source3/winbindd/winbindd_pam.c             |    4 +-
 source3/wscript                             |    9 +-
 source4/torture/ndr/samr.c                  |   34 +++
 source4/torture/rpc/spoolss.c               |  260 +++++++++++++++++++++++
 82 files changed, 1835 insertions(+), 685 deletions(-)
 create mode 100644 README.contributing
 create mode 100644 packaging/systemd/nmb.service
 create mode 100644 packaging/systemd/samba.sysconfig
 create mode 100644 packaging/systemd/smb.service
 create mode 100644 packaging/systemd/winbind.service


Changeset truncated at 500 lines:

diff --git a/README.contributing b/README.contributing
new file mode 100644
index 0000000..2d72f0c
--- /dev/null
+++ b/README.contributing
@@ -0,0 +1,120 @@
+How to contribute a patch to Samba
+----------------------------------
+
+Simple, just make the code change, and email it as either a "diff -u"
+change, or as a "git format-patch" change against the original source
+code to samba-technical at samba.org, or attach it to a bug report at
+http://bugzilla.samba.org
+
+For larger code changes, breaking the changes up into a set of simple
+patches, each of which does a single thing, are much easier to review.
+Patch sets like that will most likely have an easier time being merged
+into the Samba code than large single patches that make lots of
+changes in one large diff.
+
+Ownership of the contributed code
+---------------------------------
+
+Samba is a project with distributed copyright ownership, which means
+we prefer the copyright on parts of Samba to be held by individuals
+rather than corporations if possible. There are historical legal
+reasons for this, but one of the best ways to explain it is that it's
+much easier to work with individuals who have ownership than corporate
+legal departments if we ever need to make reasonable compromises with
+people using and working with Samba.
+
+We track the ownership of every part of Samba via git, our source code
+control system, so we know the provenance of every piece of code that
+is committed to Samba.
+
+So if possible, if you're doing Samba changes on behalf of a company
+who normally owns all the work you do please get them to assign
+personal copyright ownership of your changes to you as an individual,
+that makes things very easy for us to work with and avoids bringing
+corporate legal departments into the picture.
+
+If you can't do this we can still accept patches from you owned by
+your employer under a standard employment contract with corporate
+copyright ownership. It just requires a simple set-up process first.
+
+We use a process very similar to the way things are done in the Linux
+kernel community, so it should be very easy to get a sign off from
+your corporate legal department. The only changes we've made are to
+accommodate the licenses we use, which are GPLv3 and LGPLv3 (or later)
+whereas the Linux kernel uses GPLv2.
+
+The process is called signing.
+
+How to sign your work
+---------------------
+
+Once you have permission to contribute to Samba from
+your employer, simply email a copy of the following text
+from your corporate email address to contributing at samba.org
+
+------------------------------------------------------------
+Samba Developer's Certificate of Origin. Version 1.0
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the appropriate
+    version of the GNU General Public License; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the GNU General Public License, in the
+    appropriate version; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a) or (b) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the
+    contribution are public and that a record of the
+    contribution (including all metadata and personal
+    information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed
+    consistent with the Samba Team's policies and the
+    requirements of the GNU GPL where they are relevant.
+
+(e) I am granting this work to this project under the terms of both
+    the GNU General Public License and the GNU Lesser General Public
+    License as published by the Free Software Foundation; either version
+    3 of these Licenses, or (at the option of the project) any later
+    version.
+
+    http://www.gnu.org/licenses/gpl-3.0.html
+    http://www.gnu.org/licenses/lgpl-3.0.html
+------------------------------------------------------------
+
+We will maintain a copy of that email as a record that you have the
+rights to contribute code to Samba under the required licenses whilst
+working for the company where the email came from.
+
+Then when sending in a patch via the normal mechanisms described
+above, add a line that states:
+
+Signed-off-by: Random J Developer <random at developer.example.org>
+
+using your real name and the email address you sent the original email
+you used to send the Samba Developer's Certificate of Origin to us
+(sorry, no pseudonyms or anonymous contributions.)
+
+That's it ! Such code can then quite happily contain changes that have
+copyright messages such as :
+
+        (C) Example Corporation.
+
+and can be merged into the Samba codebase in the same way as patches
+from any other individual. You don't need to send in a copy of the
+Samba Developer's Certificate of Origin for each patch, or inside each
+patch. Just the sign-off message is all that is required once we've
+received the initial email.
+
+Have fun and happy Samba hacking !
+
+The Samba Team.
+
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 82552db..b3e5008 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
                    =============================
                    Release Notes for Samba 3.6.2
-                          , 2011
+                         January 25, 2012
                    =============================
 
 
@@ -8,12 +8,151 @@ This is the latest stable release of Samba 3.6.
 
 Major enhancements in Samba 3.6.2 include:
 
-o  
+o  Make Winbind receive user/group information (bug #8371).
+o  Several SMB2 fixes.
+
 
 Changes since 3.6.1:
 --------------------
 
 
+o   Michael Adam <obnox at samba.org>
+    * BUG 8528: Fix SEGFAULT from net registry export on not zero terminated
+      REG_SZ values.
+
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 8541: readlink() on Linux clients fails if the symlink target is
+      outside of the share.
+    * BUG 8542: smbclient posix_open command fails to return correct info on
+      open file.
+    * BUG 8548: winbind_samlogon_retry_loop ignores logon_parameters flags.
+    * BUG 8561: Password change settings not fully observed.
+    * BUG 8562: Fix double free error in talloc.
+    * BUG 8614: Ensure we correctly calculate reply credits over all returned
+      SMB2 replies.
+    * BUG 8631: POSIX ACE x permission becomes rx following mapping to and from
+      a DACL.
+    * BUG 8636: When returning an ACL without SECINFO_DACL requested, we still
+      set SEC_DESC_DACL_PRESENT in the type field.
+    * BUG 8644: vfs_acl_xattr and vfs_acl_tdb modules can fail to add
+      inheritable entries on a directory with no stored ACL.
+    * BUG 8663: Fix deleting a symlink if the symlink target is outside of
+    * the share.
+    * BUG 8664: Fix renaming a symlink if the symlink target is outside of
+      the share.
+    * BUG 8673: Fix NT ACL issue.
+    * BUG 8674: Fix buffer overflow issue with AES encryption in samba traffic
+      analyzer.
+    * BUG 8679: recvfile code path using splice() on Linux leaves data in the
+      pipe on short write.
+    * BUG 8687: Fix typo in 'net memberships' usage.
+    * BUG 8710: Fix major leak with SMB2 in connections.tdb.
+    * Fix a crash bug in the spoolss code.
+    * Add new contributing FAQ announcing acceptance of corporate (C).
+
+
+o   Christian Ambach <ambi at samba.org>
+    * BUG 8444: Add an allocation pool to idmap_autorid.
+    * BUG 8585: Increase a debug level.
+
+
+o   Andrew Bartlett <abartlet at samba.org>
+    * BUG 8623: Fix crash bug when trying to browse Samba printers.
+
+
+o   Björn Baumbach <bb at sernet.de>
+    * BUG 8580: Enable inotify if sys or kernel inotify is available.
+    * BUG 8618: Fix migrate printer code.
+
+
+o   Gregor Beck <gbeck at sernet.de>
+    * BUG 8528: Fix SEGFAULT from net registry export on not zero terminated
+      REG_SZ values.
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 7465: Remove pointless use_memory_krb5_ccache.
+    * BUG 8176: Fix perl path.
+    * BUG 8591: Fix marshalling of samr_ChangePasswordUser3.
+    * BUG 8692: libads: Fix malloc/talloc mismatch in
+      ads_keytab_verify_ticket().
+
+
+o   David Disseldorp <ddiss at suse.de>
+    * BUG 4942: DeletePrinterDriverEx deletes files in use.
+    * BUG 8575: Add systemd service files.
+    * BUG 8606: Fix intermittent print job failures caused by character
+      conversion errors.
+    * BUG 8697: Make DeletePrinterDriverEx remove printer driver files.
+
+
+o   Björn Jacke <bj at sernet.de>
+    * BUG 8531: Make DSO_EXPORTS_CMD more portable.
+    * BUG 8616: Allow to set TCP_NODELAYACK socket option on AIX.
+    * BUG 8652: Document the "ignore system acls" option of vfs_acl_xattr and
+      vfs_acl_tdb vfs modules.
+
+
+o   Frank Lahm <franklahm at googlemail.com>
+    * BUG 8419: Make VFS op "streaminfo" stackable.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 8371: Make Winbind receive user/group information.
+    * BUG 8639: Fix the vfs_commit module.
+    * BUG 8686: Packet validation checks can be done before length validation
+      causing uninitialized memory read.
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * BUG 5326: Fix cli_write_and_x() against OS/2 print shares.
+    * BUG 8357: Grant credits in async interim responses (SMB2).
+    * BUG 8560: Make SMB2 handle compound request headers in the same way
+      as Windows.
+    * BUG 8573: Fix alignment in the non-extended-security negprot.
+    * BUG 8586: libsmb: Only align unicode pipe_name.
+    * BUG 8579: smb2_flush: Don't send uninitialized memory.
+    * BUG 8592: Don't limit the number of open dptrs for SMB2.
+    * BUG 8593: Fix a crash bug in cldap_socket_recv_dgram().
+    * BUG 8684: Try ctdbd_init_connection() as root.
+
+
+o   Masafumi Nakayama <MASA23 at jp.ibm.com>
+    * BUG 563: Fix 'smbclient tar' for files greater than 8GB on BE machines.
+
+
+o   Matthieu Patou <mat at matws.net>
+    * BUG 8600: Make cldap work over IPv6.
+    * BUG 8674: Fix buffer overflow issue with AES encryption in samba traffic
+      analyzer.
+
+
+o   Andreas Schneider <asn at samba.org>
+    * BUG 8550: Fix setting the machine account password.
+    * BUG 8575: Add systemd service files.
+    * BUG 8608: Winbind: Don't fail on users without a uid.
+    * BUG 8628: libsmb: Don't duplicate Kerberos service tickets.
+    * BUG 8643: Add an update function for Winbind cache.
+    * BUG 8678: Fix Winbind segfault if we can't map the last user.
+
+
+o   Karolin Seeger <kseeger at samba.org>
+    * BUG 7705: Fix some RHEL packaging issues.
+
+
+o   Richard Sharpe <realrichardsharpe at gmail.com>
+    * BUG 8607: Improve configure.in so it can be used outside the Samba source
+      tree.
+
+
+o   Brad Smith <brad at comstyle.com>
+    * BUG 8525: Fix bug with sys_fseek() wrapper on *BSD / OS X).
+
+
+o   Henry Wong <henry at stuffedcow.net>
+    * BUG 8384: Fix Windows XP clients crashing smbd process every once in a
+      while.
 
 
 ######################################################################
diff --git a/docs-xml/manpages-3/idmap_autorid.8.xml b/docs-xml/manpages-3/idmap_autorid.8.xml
index 87b9268..c437d0e 100644
--- a/docs-xml/manpages-3/idmap_autorid.8.xml
+++ b/docs-xml/manpages-3/idmap_autorid.8.xml
@@ -51,7 +51,12 @@
 			for regular users. As the parameter cannot be changed later, please
 			plan accordingly for your expected number of users in a domain
 			with safety margins.
-		</para>
+			</para>
+			<para>One range will be used for local users and groups.
+			Thus the number of local users and groups that can be created is
+			limited by this option as well. If you plan to create a large amount
+			of local users or groups, you will need set this parameter accordingly.
+			</para>
 		<para>The default value is 100000.</para>
 		</listitem>
 		</varlistentry>
diff --git a/docs-xml/manpages-3/vfs_acl_tdb.8.xml b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
index 646c5ba..7c22dec 100644
--- a/docs-xml/manpages-3/vfs_acl_tdb.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_tdb.8.xml
@@ -45,9 +45,26 @@
 
 <refsect1>
 	<title>OPTIONS</title>
-	<para>
-	There are no options for <command>vfs_acl_tdb</command>.
-	</para>
+
+	<variablelist>
+		<!-- please keep in sync with the other acl vfs modules that provide the same options -->
+		<varlistentry>
+		<term>acl_tdb:ignore system acls = [yes|no]</term>
+		<listitem>
+		<para>
+		When set to <emphasis>yes</emphasis>, a best effort mapping
+		from/to the POSIX ACL layer will <emphasis>not</emphasis> be
+		done by this module. The default is <emphasis>no</emphasis>,
+		which means that Samba keeps setting and evaluating both the
+		system ACLs and the NT ACLs. This is better if you need your
+		system ACLs be set for local or NFS file access, too. If you only
+		access the data via Samba you might set this to yes to achieve
+		better NT ACL compatibility.
+		</para>
+		</listitem>
+		</varlistentry>
+	</variablelist>
+
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages-3/vfs_acl_xattr.8.xml b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
index d428cc2..41a8a97 100644
--- a/docs-xml/manpages-3/vfs_acl_xattr.8.xml
+++ b/docs-xml/manpages-3/vfs_acl_xattr.8.xml
@@ -49,9 +49,26 @@
 
 <refsect1>
 	<title>OPTIONS</title>
-	<para>
-	There are no options for <command>vfs_acl_xattr</command>.
-	</para>
+
+	<variablelist>
+		<!-- please keep in sync with the other acl vfs modules that provide the same options -->
+		<varlistentry>
+		<term>acl_xattr:ignore system acls = [yes|no]</term>
+		<listitem>
+		<para>
+		When set to <emphasis>yes</emphasis>, a best effort mapping
+		from/to the POSIX ACL layer will <emphasis>not</emphasis> be
+		done by this module. The default is <emphasis>no</emphasis>,
+		which means that Samba keeps setting and evaluating both the
+		system ACLs and the NT ACLs. This is better if you need your
+		system ACLs be set for local or NFS file access, too. If you only
+		access the data via Samba you might set this to yes to achieve
+		better NT ACL compatibility.
+		</para>
+		</listitem>
+		</varlistentry>
+	</variablelist>
+
 </refsect1>
 
 <refsect1>
diff --git a/examples/VFS/configure.in b/examples/VFS/configure.in
index 4e9d465..9e30197 100644
--- a/examples/VFS/configure.in
+++ b/examples/VFS/configure.in
@@ -337,11 +337,11 @@ AC_CACHE_CHECK([whether building shared libraries actually works],
    ac_cv_shlib_works=no
    # try building a trivial shared library
    if test "$PICSUFFIX" = "po"; then
-     $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${srcdir-.}/../../tests/shlib.c &&
+     $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.po ${SAMBA_SOURCE}/../tests/shlib.c &&
        $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" shlib.po &&
        ac_cv_shlib_works=yes
    else
-     $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.$PICSUFFIX ${srcdir-.}/../../tests/shlib.c &&
+     $CC $CPPFLAGS $CFLAGS $PICFLAGS -c -o shlib.$PICSUFFIX ${SAMBA_SOURCE}/../tests/shlib.c &&
        mv shlib.$PICSUFFIX shlib.po &&
        $CC $CPPFLAGS $CFLAGS `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" shlib.po &&
        ac_cv_shlib_works=yes
@@ -350,6 +350,7 @@ AC_CACHE_CHECK([whether building shared libraries actually works],
 ])
 if test $ac_cv_shlib_works = no; then
    BLDSHARED=false
+   AC_MSG_WARN([[Did you forget to specify --with-samba-source=/path/to/samba?]])
 fi
 fi
 
diff --git a/examples/misc/wall.perl b/examples/misc/wall.perl
index 9303658..72d6e89 100644
--- a/examples/misc/wall.perl
+++ b/examples/misc/wall.perl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 # 
 #@(#) smb-wall.pl Description:
 #@(#) A perl script which allows you to announce whatever you choose to
diff --git a/lib/util/debug.c b/lib/util/debug.c
index 2ff7cb2..108161e 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -202,7 +202,7 @@ void gfree_debugsyms(void)
 
 	TALLOC_FREE(format_bufr);
 
-	debug_num_classes = DBGC_MAX_FIXED;
+	debug_num_classes = 0;
 
 	state.initialized = false;
 }
diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c
index f5585c2..aa34a6d 100644
--- a/libcli/cldap/cldap.c
+++ b/libcli/cldap/cldap.c
@@ -273,12 +273,9 @@ static bool cldap_socket_recv_dgram(struct cldap_socket *c,
 
 	DLIST_REMOVE(c->searches.list, search);
 
-	if (!cldap_recvfrom_setup(c)) {
-		goto nomem;
-	}
+	cldap_recvfrom_setup(c);
 
 	tevent_req_done(search->req);
-	talloc_free(in);
 	return true;
 
 nomem:
@@ -286,6 +283,7 @@ nomem:
 error:
 	status = map_nt_error_from_unix(in->recv_errno);
 nterror:
+	TALLOC_FREE(in);
 	/* in connected mode the first pending search gets the error */
 	if (!c->connected) {
 		/* otherwise we just ignore the error */
@@ -294,9 +292,11 @@ nterror:
 	if (!c->searches.list) {
 		goto done;
 	}
+	cldap_recvfrom_setup(c);
 	tevent_req_nterror(c->searches.list->req, status);
+	return true;
 done:
-	talloc_free(in);
+	TALLOC_FREE(in);
 	return false;
 }
 
@@ -313,6 +313,27 @@ NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx,
 	struct tsocket_address *any = NULL;
 	NTSTATUS status;
 	int ret;
+	const char *fam = NULL;
+
+	if (local_addr == NULL && remote_addr == NULL) {
+		return NT_STATUS_INVALID_PARAMETER_MIX;
+	}
+
+	if (remote_addr) {
+		bool is_ipv4;
+		bool is_ipv6;
+
+		is_ipv4 = tsocket_address_is_inet(remote_addr, "ipv4");
+		is_ipv6 = tsocket_address_is_inet(remote_addr, "ipv6");
+
+		if (is_ipv4) {
+			fam = "ipv4";
+		} else if (is_ipv6) {
+			fam = "ipv6";
+		} else {
+			return NT_STATUS_INVALID_ADDRESS;
+		}
+	}
 
 	c = talloc_zero(mem_ctx, struct cldap_socket);
 	if (!c) {
@@ -329,11 +350,14 @@ NTSTATUS cldap_socket_init(TALLOC_CTX *mem_ctx,
 	c->event.ctx = ev;
 
 	if (!local_addr) {
-		/* we use ipv4 here instead of ip, as otherwise we end
-		   up with a PF_INET6 socket, and sendto() for ipv4
-		   addresses will fail. That breaks cldap name


-- 
Samba Shared Repository


More information about the samba-cvs mailing list