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

Karolin Seeger kseeger at samba.org
Wed Feb 17 09:40:58 MST 2010


The branch, v3-4-stable has been updated
       via  34d5071... WHATSNEW: Update changes since 3.4.5.
       via  45b2e94... cifs.upcall: allocate a talloc context for smb_krb5_unparse_name
       via  27b8ae5... s3-docs: Add missing para end tag.
       via  f57eeba... spoolss: disable GetPrinterDriver level 101 (as called by XP).
       via  c02c05d... s3-docs: fix eventlogadm manpage typo.
       via  c4607c0... Fixes issue with preexec scripts creating a share directory, and problems if a smb.conf reload turns wide links back on after a connection is establised.
       via  e6f9d3c... s3: Fix typo found by jhell <jhell at DataIX.net> (cherry picked from commit 271a4c60dbec0d001dc55df58de8e54274137853) (cherry picked from commit eb390b8f917f52eb28f46f39a19abdc717051f3d) (cherry picked from commit f8dbb021393edf9d8394b5b7adf03c3432257ce7)
       via  6f807f5... s3-spoolss: implement spoolss_EnumJobs level 3.
       via  7b6b5c4... s3:passdb: only use gid_to_sid() result if the result is a group of our local sam
       via  2c08182... s3:pdb_ldap: don't search for the users primary group, if we already know it
       via  adaaf2c... s3:pdb_ldap: optimize ldapsam_alias_memberships() and cache ldap searches.
       via  9cae496... s3:pdb_ldap: try to build the full unix_pw structure with ldapsam:trusted support
       via  c19ee2b... s3:passdb: speed up pdb_get_group_sid()
       via  bece99d... s3: Make pdb_copy_sam_account also copy the group sid
       via  35752c0... s3: shortcut gid_to_sid when "ldapsam:trusted = yes"
       via  b9ec2da... s3:is_trusted_domain: shortcut if domain name == global_sam_name
       via  07019c3... s3:is_trusted_domain: shortcut if domain name is NULL or empty
       via  17ef5e9... s3: shortcut uid_to_sid when "ldapsam:trusted = yes"
       via  ba734d2... s3:smbd: also fill the memcache with sid<->id mappings in ldapsam_sid_to_id()
       via  a635050... s3:smbd: make idmap cache persistent for "ldapsam:trusted".
       via  12f4e9a... Fix large paged search
       via  a50dc30... =?utf-8?q?=D1=953:ldap:=20search=20for=20account=20policies=20in=20objectclass=20sambaDomain,=20not=20*
       via  d416973... s3:ldap: don't search when no values where found (cherry picked from commit 70063522065ab3e5a21fb11db0097b808aa11100)
       via  9206eb8... Fix bug #7122 - Reading a large browselist fails (server returns invalid values in subsequent SMBtrans replies)
       via  f030e76... Fix off-by-one error in working out the limit of the NetServerEnum comment.
       via  5ea0fbb... s3:smbd: use StrCaseCmp() instead of strcasecmp
       via  f364e84... s3:smbd: Fix really ugly bool vs. int bug!!!
       via  7948c58... s3:libsmb: fix NetServerEnum3 rap calls.
       via  f7c5a16... s3:smbd: implement api_RNetServerEnum3
       via  fdc1887... util: added binsearch.h for binary array searches
       via  dddb1c4... s3:smbd: add/improve some DEBUG messages in api_RNetServerEnum2()
       via  8e336a0... s3:smbd: rename api_RNetServerEnum => api_RNetServerEnum2
       via  c0fa8a3... Missed one check on the memcpy for bug #7063.
       via  17a37d5... Second part of fix for bug 7063 - Samba 3.4.5 on ubuntu 8.04 64 bit - Core dumps.
       via  ae430b8... Fix bug 7104 - "wide links" and "unix extensions" are incompatible.
       via  799f1d9... Fix bug 7063 - Samba 3.4.5 on ubuntu 8.04 64 bit - Core dumps.
       via  fc6616e... s3: Fix an uninitialized variable reference
       via  4d8fb15... s3: Fix malformed require_membership_of_sid.
       via  91a38a7... s3: normalize "Changing password for" msg IDs and STRs
       via  42a78fb... s3:libsmb: don't reuse the callers stype variable in cli_NetServerEnum()
       via  2614774... Add cross option to samba_cv_linux_getgrouplist_ok
       via  fff94aa... s3/smbd: Fix string buffer overflow causing heap corruption
       via  b5c8ef8... s3: Simplify the code a bit: Catch (len==0) early
       via  fb5f17d... Fix bug 7081 - vfs_expand_msdfs doesn't work correctly (with fix identified)
       via  afbf11a... Fix bug #7072 - Accounts can't be unlocked from ldap.
       via  c81c109... Fix bug #7067 - Linux asynchronous IO (aio) can cause smbd to fail to respond to a read or write.
       via  389c94a... Do not segfault in pdb_search_destructor if no real search was started (cherry picked from commit d07464b21fe652e205f5eb2c74d12495bab100ce)
       via  3b330fe... s3-docs: Adapt version in man ldbrename.
       via  21a797c... s3/docs: Add missing meta data to man ldbrename.
       via  8e2eece... s3: Fix bug 7052: "DFS broken on AIX (maybe others)" (cherry picked from commit c531d00ab4444db19ff6ba4c60ebdcc8319949c6) (cherry picked from commit f21796955e7aa2e84a1c810612f2fdee2bde611c) (cherry picked from commit 28b3cf328312a26cd72bbc54f3283bc46b51bc32)
       via  2e75a6a... s3-docs: Fix typos.
       via  90b0ff5... s3:pdb_ldap: restore Samba 3.0.x behavior and use the first "uid" value.
       via  35aa00b... s3:smbldap: add smbldap_talloc_first_attribute()
       via  17e7a47... WHATSNEW: Start release notes for Samba 3.4.6.
       via  3cba662... VERSION: Raise version number up to 3.4.6.
      from  6ac4141... WHATSNEW: Update changes.

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


- Log -----------------------------------------------------------------
commit 34d5071c1bbb7514d958968315bc182ea89a4b03
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Feb 17 17:39:15 2010 +0100

    WHATSNEW: Update changes since 3.4.5.
    
    Karolin
    (cherry picked from commit 05e26adc494ad9066e2d4f438368a782db553916)

commit 45b2e94043134673cd7a31cba23574cd2bddd298
Author: Jeff Layton <jlayton at redhat.com>
Date:   Tue Feb 16 09:16:42 2010 -0500

    cifs.upcall: allocate a talloc context for smb_krb5_unparse_name
    
    cifs.upcall calls smb_krb5_unparse_name with a NULL talloc context.
    Older versions of this function though will conditionally use
    SMB_REALLOC instead of TALLOC_REALLOC when a NULL context is passed
    in. To make it more consistent, just spawn a talloc context that
    we can pass into this function.
    
    Resolves:
    https://bugzilla.redhat.com/show_bug.cgi?id=565446
    https://bugzilla.samba.org/show_bug.cgi?id=6868
    
    Reported-by: Ludek Finstrle <luf at seznam.cz>
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit a8cc2fa09ed43a167f62711bef363a5ac335dc78)
    
    Fix bug #6868 (make bin/cifs.upcall fails).
    (cherry picked from commit fa8d57323c0ff4f92f0aca57b41d237340121720)

commit 27b8ae5d61c91d84e34de66d4071a52bb5ca9751
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Feb 9 16:36:39 2010 +0100

    s3-docs: Add missing para end tag.
    
    Karolin
    (cherry picked from commit b78de63ef3cde53e3aabbe46654aac5a335f16a8)
    (cherry picked from commit d3738dbe1cabb0ad0acf5f8c9b5e8106285ca9a1)

commit f57eeba1640868f0ff51d77a5e04c113132d0595
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 15 11:34:17 2010 +0100

    spoolss: disable GetPrinterDriver level 101 (as called by XP).
    
    We still dont get the marshalling right, disable and XP will just fall back to
    level 6.
    
    Guenther
    
    Fix bug #7136 (spoolss getprinterdriver2 level 101 marshalling bad).
    (cherry picked from commit 4a55047465029f302c92c7490aeebc1daa7b4e85)

commit c02c05db5f32e31ac982668b9cf9b8533a54452f
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jan 7 12:05:18 2010 +0100

    s3-docs: fix eventlogadm manpage typo.
    
    Guenther
    (cherry picked from commit c1ca00047d26ace240fa5f34b428392b5d61e6c3)
    
    Fix bug #7137 (eventlogadm manpage typo for dump command).
    (cherry picked from commit 5c4fff696638d3e682fa3c8951d560e891196fc4)

commit c4607c05ca39976d930d1cf5ffc5b820584a90a2
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 11 16:03:02 2010 -0800

    Fixes issue with preexec scripts creating a share directory, and problems if a smb.conf reload turns wide links back on after a connection is establised.
    
    Includes git refs :
    cd18695fc2e4d09ab75e9eab2f0c43dcc15adf0b
    94865e4dbd3d721c9855aada8c55e02be8b3881e
    5d92d969dda450cc3564dd2265d2b042d832c542
    02a5078f1fe6285e4a0b6ad95a3aea1c5bb3e8cf
    a6f402ad87ff0ae14d57d97278d67d0ceaaa1d82
    
    from master.
    
    Jeremy.
    
    Fix bug #7104 ("wide links" and "unix extensions" are incompatible.)
    (cherry picked from commit 16e73d88944ce644cccfa19a99338f5903c061f0)

commit e6f9d3cffa2dd5c2bc984d918f51680bed4e259a
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Feb 13 16:38:25 2010 +0100

    s3: Fix typo found by jhell <jhell at DataIX.net>
    (cherry picked from commit 271a4c60dbec0d001dc55df58de8e54274137853)
    (cherry picked from commit eb390b8f917f52eb28f46f39a19abdc717051f3d)
    (cherry picked from commit f8dbb021393edf9d8394b5b7adf03c3432257ce7)

commit 6f807f57cd10fd92e8ffb305650a693ed99d336e
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 11 00:44:06 2010 +0100

    s3-spoolss: implement spoolss_EnumJobs level 3.
    
    Level 3 has been added with NT 4.0 and Windows 7 (at least 64bit version) makes
    use of it in order to display queued jobs. Windows 7 will *not* fall back to
    level 2 if we just return WERR_UNKNOWN_LEVEL, instead there will be no printjobs
    displayed at all.
    
    Guenther
    (cherry picked from commit 25001bbd1b0b32073073dab7cf5b78a2b902163f)
    (cherry picked from commit eacb3b7be16884bb6bfcc3b4db97708566d66c40)
    
    Fix bug #7130 (enumjobs level 3 is required by win7).
    (cherry picked from commit 7132ca8d41ce936287e5f64e3596c5d1d1b67769)

commit 7b6b5c40e79e50c6affb52325b775ddfd28654f9
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 9 12:57:01 2010 +0100

    s3:passdb: only use gid_to_sid() result if the result is a group of our local sam
    
    Otherwise retry with pdb_gid_to_sid().
    
    metze
    (cherry picked from commit 4dc2be2264926fe415e4e40e212f94793c9831d1)
    
    Last seven patches address bug #7116 (pdb_ldap performance fixes).
    (cherry picked from commit 8946a47fcebe57f459c59ee2cb163e15901ff996)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 5b5df3d1223d15d4fde9a2a2db83c60aaa266ca4)

commit 2c08182a687f2fade833b8ef9f6db0cc946c5999
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 5 16:20:21 2010 +0100

    s3:pdb_ldap: don't search for the users primary group, if we already know it
    
    metze
    (cherry picked from commit 6753fb1cf6a834b12b2a9dce3b1a9555390c17be)
    (cherry picked from commit da7cb9feacc7cb84499c73ef463d187a7b2754e8)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 0b2dd730a52ae9dbd622c50fb70492398f6503d9)

commit adaaf2cda06fc32045b2e71b278c52b50f2d46e6
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Feb 3 11:32:41 2010 +0100

    s3:pdb_ldap: optimize ldapsam_alias_memberships() and cache ldap searches.
    
    ldapsam_alias_memberships() does the same LDAP search twice, triggered
    via add_aliases() from create_local_nt_token().
    
    This happens when no domain aliases are used.
    
    metze
    (cherry picked from commit 49ace81e19de231825216cbf07c7422687131bb6)
    (cherry picked from commit cb31c1df92b195b3fb80b6e21bfba83b8cd867fd)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 8f1c7c117b3bca058024daa34f777efa5ece88f8)

commit 9cae496868261e0f21add61df9c86c5089d39d67
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Feb 4 17:19:57 2010 +0100

    s3:pdb_ldap: try to build the full unix_pw structure with ldapsam:trusted support
    
    And also store the gid_to_sid mappings in the idmap_cache.
    
    metze
    (cherry picked from commit 25038fa85ff69962ca0975f31802218a897aa1ec)
    (cherry picked from commit 66a48d2226d245c373b744c7edea60b3daa57f0f)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit a2ff5f0dd08c40fdbea8cb11e1b18d996a4d8c39)

commit c19ee2bfa89ec13845f8c1d057749ecc4923f6ec
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Feb 4 17:16:59 2010 +0100

    s3:passdb: speed up pdb_get_group_sid()
    
    Use the cached version gid_to_sid() instead
    of pdb_gid_to_sid().
    
    And also avoid the expensive lookup_sid() call
    for wellkown domain groups.
    
    metze
    (cherry picked from commit e10d0869567436902c8b8cfb50f8c64148d554cb)
    (cherry picked from commit b0c8ff971934ef8aa21abece8693807e0a2ca722)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 5d97d5703dcf62f2c610316b2ba47483652368b3)

commit bece99d4ea7c6812b73967d024f1ed13fdc7de1b
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jan 31 15:18:51 2010 +0100

    s3: Make pdb_copy_sam_account also copy the group sid
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit b99046fed1bf4a908ed856afb17c3c934c6d305d)
    (cherry picked from commit a1862c23346959cd0aa77653bf488e0686d14376)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 66b472fdd6e55550abe4db04b0666d56ec700a0e)

commit 35752c0aace9015f7e856ecbce59ed6f0a3e3a19
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Jan 30 22:28:19 2010 +0100

    s3: shortcut gid_to_sid when "ldapsam:trusted = yes"
    
    The normal gid_to_sid behaviour is to call sys_getgrgid()
    to get the name for the given gid and then call the
    getsamgrnam passdb method for the resulting name.
    
    In the ldapsam:trusted case we can reduce the gid_to_sid
    operation to one simple search for the gidNumber attribute
    and only get the sambaSID attribute from the correspoinding
    LDAP object. This reduces the number of ldap roundtrips
    for this operation.
    
    metze
    (similar to commit 0fb99386d41241f62312d4bb535976344e5d6492)
    (cherry picked from commit 479087716f50e8a1961163750b1d651dcd23dfc2)

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

    s3:is_trusted_domain: shortcut if domain name == global_sam_name
    
    A domain can't have a trust with itself.
    This saves some roundtrips to the ldap server for ldapsam.
    
    Michael
    (cherry picked from commit dc3a90cf21813526854c12db126d08ebf32f8ae5)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit c48405ed0ab0e3c3a0c1472e3bf874a4a64c0261)

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

    s3:is_trusted_domain: shortcut if domain name is NULL or empty
    
    This saves some roundtrips to LDAP in an ldapsm setup.
    
    Michael
    (cherry picked from commit 0aa5a60d3033fddd652eb4ea89abdf97db912df3)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 85d8565e8c5a290698d0f0599f851dc0bee50245)

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

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

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

    s3:smbd: also fill the memcache with sid<->id mappings in ldapsam_sid_to_id()
    
    not only the persistent idmap cache.
    
    Michael
    (cherry picked from commit ee2565bd461ccfb916c5290c883e5ced3af72141)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 05f23a8dd6824bb6af3f60304096e621e534f4d4)

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

    s3:smbd: make idmap cache persistent for "ldapsam:trusted".
    
    This stores the mappings found in the idmap cache (which lives
    inside gencache). This cache is already read in sid_to_Xid()
    and Xid_to_sid() for ldapsam:trusted, this fills the opposite
    direction, massively reducing the number of ldap roundtrips
    across smbd restarts.
    
    Michael
    (cherry picked from commit d5537cbbf931f0bca519371bfd084fb0051acd57)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit c7220ff3a8281867ffc1a3bcaa992ca9eafba6ed)

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

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

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

    =?utf-8?q?=D1=953:ldap:=20search=20for=20account=20policies=20in=20objectclass=20sambaDomain,=20not=20*
    
    =20(cherry=20picked=20from=20commit=20e5f41591504769b5c7beb5a35bb0f95b33d27a8b)?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=utf-8
    Content-Transfer-Encoding: 8bit
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 4e66860d89872d2ba808761e0d58ed18e7ed428e)

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

    s3:ldap: don't search when no values where found (cherry picked from commit 70063522065ab3e5a21fb11db0097b808aa11100)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 0b7d7e7c3d6a5abe94a0864f1ccaf9d1c00b8b7d)

commit 9206eb87627cf8088e5e188a9e93e271f07c9c07
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 9 15:14:38 2010 -0800

    Fix bug #7122 - Reading a large browselist fails (server returns invalid values in subsequent SMBtrans replies)
    
    There are two problems:
    
    1). The server is off-by-one in the end of buffer space test.
    2). The server returns 0 in the totaldata (smb_vwv1) and totalparams (smb_vwv0)
    fields in the second and subsequent SMBtrans replies.
    
    This patch fixes both.
    
    Jeremy.
    (cherry picked from commit 8ddc977c1421a47bedba8d5494f7ae67692b772a)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 8ac6085a2c7382e544888e632ff62c30f7e7a884)

commit f030e761f1d4a68429694ebf56678d43dc0d2ff6
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 9 12:17:08 2010 -0800

    Fix off-by-one error in working out the limit of the NetServerEnum comment.
    
    Jeremy.
    (cherry picked from commit 9ad6f432f3f5844b4b419e7cbaf3c3e70b052d29)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 026f05839b6dbdeb5be3953930a28f7650c1e1da)

commit 5ea0fbb84cb4c7fd058e514c6fa65277c9127d7f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 9 18:58:36 2010 +0100

    s3:smbd: use StrCaseCmp() instead of strcasecmp
    
    metze
    (cherry picked from commit bc8242a08e1bb9489cc8171b1ec02bd2518b1857)
    (cherry picked from commit 8142883b40819b5cb92ea671bb6c89bff68d3680)

commit f364e845ab91691c154f9fba0a6f802eeee51176
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 9 18:54:41 2010 +0100

    s3:smbd: Fix really ugly bool vs. int bug!!!
    
    A comparison function for qsort needs to return an 'int'!
    Otherwise you'll get random results depending on the compiler
    and the architecture...
    
    metze
    (cherry picked from commit 1686a5e7e7eb1b411b003cbbde5c0d28741c6d02)
    (cherry picked from commit 4e419df9154c329b3376ab00d6bb55093fbfe71a)

commit 7948c58dd1e7e3173f3da7c7a7f48ddc90f81444
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Feb 8 18:38:03 2010 +0100

    s3:libsmb: fix NetServerEnum3 rap calls.
    
    metze
    (cherry picked from commit 9b5198dd443a00fdad4faa1f9cdabedd81012d93)
    (cherry picked from commit 86eae5b4862735309313e1800be44dab2641b393)

commit f7c5a163aaa5a604010637fa1017fc54e83ab4b8
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Feb 8 19:07:45 2010 +0100

    s3:smbd: implement api_RNetServerEnum3
    
    This is needed to support large browse lists.
    
    metze
    (cherry picked from commit 30eec0656c926d3d85a438dc28f17649b53318f8)
    (cherry picked from commit f37f187070934e1046ce05d298d92ede7e6f7030)

commit fdc188725146ce3393b41b4203b8d665c2324402
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Dec 10 14:35:24 2009 +1100

    util: added binsearch.h for binary array searches
    
    This was moved from the schema_query code. It will now be used in more
    than one place, so best to make it a library macro. I think there are
    quite a few places that could benefit from this.
    (cherry picked from commit 71943e8858943718affb6a3c0ded2127f07057f0)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 448b8f35d7a7cff73d35304673302178f593c9d0)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 2614ed62c8ca281d95151913ed591a86409e0566)

commit dddb1c44532ba84ddec536aa335e68133d5aa4b3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Feb 8 18:45:18 2010 +0100

    s3:smbd: add/improve some DEBUG messages in api_RNetServerEnum2()
    
    metze
    (cherry picked from commit 495ac4616654c9e62e14031b7439aff21e42ec91)
    (cherry picked from commit f8f6beff57fd58b69648633f5b1c15289015f96b)

commit 8e336a00a8f4793f51f0adb2d8e1fe2729f118bd
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 5 16:55:15 2010 +0100

    s3:smbd: rename api_RNetServerEnum => api_RNetServerEnum2
    
    metze
    (cherry picked from commit dc58672c6588a1715698721153b35ed2d594bc67)
    (cherry picked from commit 0b6d850a553c0a558d579ab5e46f49794a015e34)

commit c0fa8a3b0733c897f67e1b3b6b6d653380248ec1
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 9 14:56:12 2010 -0800

    Missed one check on the memcpy for bug #7063.
    
    Jeremy.
    (cherry picked from commit 832fed700589ba0a49381fac71ff99edb5e8f167)

commit 17a37d5579f9c27a8ff992a396982d2240f9666e
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 9 14:48:15 2010 -0800

    Second part of fix for bug 7063 - Samba 3.4.5 on ubuntu 8.04 64 bit - Core dumps.
    
    Ensure we have no naked memcpy calls. This isn't a crash bug (it's
    already checked in the data_blob_talloc_zero() above, but I want to
    get into the pattern of having all memcpy's covered by safety checks.
    
    Jeremy.
    (cherry picked from commit 974bc68d7884ab77210a237e4ca8020ee88ae059)

commit ae430b88cef65a96f4126c2c26cb426eb857bfd5
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 5 16:22:27 2010 -0800

    Fix bug 7104 - "wide links" and "unix extensions" are incompatible.
    
    Change parameter "wide links" to default to "no".
    Ensure "wide links = no" if "unix extensions = yes" on a share.
    Fix man pages to refect this.
    
    Remove "within share" checks for a UNIX symlink set - even if
    widelinks = no. The server will not follow that link anyway.
    
    Correct DEBUG message in check_reduced_name() to add missing "\n"
    so it's really clear when a path is being denied as it's outside
    the enclosing share path.
    
    Jeremy.
    (cherry picked from commit 9e64c33b7757dd4528a9c8d31d0c0c159a33daf8)

commit 799f1d9cbdec5e6365b50cc476826b5c7ae4299d
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 2 16:38:40 2010 -0800

    Fix bug 7063 - Samba 3.4.5 on ubuntu 8.04 64 bit - Core dumps.
    
    Reported and found by Martin Hochreiter <linuxbox at wavenet.at>.
    Ensure we copy the right amount of registry data into the outgoing
    buffer.
    
    Jeremy.
    (cherry picked from commit 4dd841cf3f71b33a18db70bbbb968a647aaa8efc)

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

    s3: Fix an uninitialized variable reference
    
    Fix bug #5885 (swat prints a bogus ip-address in smb.conf).
    (cherry picked from commit 2db64331ae27c8bf6ce341f6cab8f02e706a3f7a)

commit 4d8fb15892a5a08714f6772167a9433362865653
Author: Bo Yang <boyang at samba.org>
Date:   Sun Feb 7 14:45:42 2010 +0800

    s3: Fix malformed require_membership_of_sid.
    
    Signed-off-by: Bo Yang <boyang at samba.org>
    (cherry picked from commit 913a9f4e420c7a4177e6a7874e8ec2703f447918)
    
    Fix bug #7106.
    (cherry picked from commit 7e965f545b6f4d5f1ad12f4177eb477248c895c8)

commit 91a38a7fe36b899625d21654857f93a8f3fbf7d3
Author: Lars Müller <lars at samba.org>
Date:   Fri Feb 5 17:38:04 2010 +0100

    s3: normalize "Changing password for" msg IDs and STRs
    
    An additional space at the end of the "Changing password for" msgid lead
    to untranslated pam_winnind messages.
    (cherry picked from commit f9f1db18834648da73b7b1f6d9472523941e8277)
    
    Fix bug #7102 (normalize "Changing password for" msg IDs and STRs).
    (cherry picked from commit f6322442f54d49b8bacec2d8fc7960d0b87d674b)
    (cherry picked from commit 1bbbc152b4222554b2738108f3e267e147411166)

commit 42a78fbfd07088f677f1c51cce067f877adc6e25
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Feb 4 14:03:20 2010 +0100

    s3:libsmb: don't reuse the callers stype variable in cli_NetServerEnum()
    
    When we need to do more than one network operation to get the
    browse list we need to use the same 'stype' value each time.
    
    metze
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit c2e4746fa9d68e7601e8e90cc0144d2e65a695b6)
    
    Fix bug #7098 (smbclient -L gives wrong results with a large browse list).
    (cherry picked from commit 49ed8e5ef079edf42bbe5325a46547ecfdff8a7d)

commit 2614774f346fb6d10b9263f34e62d36aff9f54d8
Author: Lars Müller <lars at samba.org>
Date:   Thu Feb 4 11:19:06 2010 +0100

    Add cross option to samba_cv_linux_getgrouplist_ok
    
    "cross" as an option got removed accidentl with commit e5a95132 while
    moving in direction of 3.2.
    
    Patch proposed by Richard Sharpe <realrichardsharpe at gmail.com>.
    (cherry picked from commit 30ea9932f5ea8a73c84dbab3ae3e997c2ae34e79)
    
    Fix bug #7047.
    (cherry picked from commit 050f86f83b8d6642e1b88c37f4ad294f5e206b87)

commit fff94aa436d4ae2707a9bff75aa27c404882067f
Author: Steven Danneman <steven.danneman at isilon.com>
Date:   Sat Jan 30 13:29:23 2010 -0800

    s3/smbd: Fix string buffer overflow causing heap corruption
    
    The destname malloc size was not taking into account the 1 extra byte
    needed if a string without a leading '/' was passed in and that slash
    was added.
    
    This would cause the '\0' byte to be written past the end of the
    malloced destname string and corrupt whatever heap memory was there.
    
    This problem would be hit if a share name was given in smb.conf without
    a leading '/' and if it was the exact size of the allocated STRDUP memory
    which in some implementations of malloc is a power of 2.
    (cherry picked from commit f42971c520360e69c4cdd64bebb02a5f5ba49b94)
    
    Fix bug #7096.
    (cherry picked from commit db5ccb70b6ac51ea263889cc9cdd523673ae8ecd)
    (cherry picked from commit 3916710b9414d679774399e6d0cff61e4b67a2e3)

commit b5c8ef81bd5178ceb68b492a1eeac911289edb82
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Feb 3 14:06:25 2010 -0800

    s3: Simplify the code a bit: Catch (len==0) early
    
    Part of a fix for bug #7081.
    (cherry picked from commit ecec9fb2d283f17aee8eceb39ab61d8204cff0f3)

commit fb5f17d642be3a21cd94621714cb85d77abc7606
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 2 16:43:41 2010 -0800

    Fix bug 7081 - vfs_expand_msdfs doesn't work correctly (with fix identified)
    
    Fix inspired by idea from Eric Horst <erich at cac.washington.edu>.
    
    Jeremy.
    (cherry picked from commit de24209f0a745ada4220a1751c4ed88ae6eea575)
    (cherry picked from commit fd630147319b9a21426ba2a34b726c35c03396b6)

commit afbf11a85104bcdd936c2fa40793b27d8328a209
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 27 16:55:47 2010 -0800

    Fix bug #7072 - Accounts can't be unlocked from ldap.
    
    Fix suggested by Andy Hanton <andyhanton at gmail.com>. The LOGIN_CACHE
    struct contains two time_t entries, but was being written to and
    read from via tdb_pack/tdb_unpack functions using explicit 32-bit int specifiers.
    This would break on machines with a 64-bit time_t. Use correct int
    sizes for tdb_pack/tdb_unpack.
    
    We have to fix this properly before 2037 :-).
    
    Contains fixes from master 627fb85092f728065b6d772c41aeb75018154e86
    and 69fd8461b8792f4fee1b61db03953044565492c6.
    
    Jeremy.
    (cherry picked from commit 3a341c54ba6b8b63419662207f1d42767a00eb16)

commit c81c109a6ce83741bb5149a51ceb4ab30855e9f9
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 26 16:51:57 2010 -0800

    Fix bug #7067 - Linux asynchronous IO (aio) can cause smbd to fail to respond to a read or write.
    
    Only works on Linux kernels 2.6.26 and above. Grants CAP_KILL capability
    to allow Linux threads under different euids to send signals to each other.
    
    Jeremy.
    (cherry picked from commit 899bd0005f56dcc1e95c3988d41ab3f628bb15db)
    (cherry picked from commit 246eba3b807e5ce50ee838c51823a9eb44f6b690)

commit 389c94a5802115ae6adde5eb108d5122c21123f8
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 27 18:40:13 2009 +0200

    Do not segfault in pdb_search_destructor if no real search was started
    (cherry picked from commit d07464b21fe652e205f5eb2c74d12495bab100ce)
    
    Fix bug #7068 (pdb_search api may crash as non-root user).
    (cherry picked from commit 135b67a627fd1e98b4211fe3ac738ae2fec10145)

commit 3b330fe8d6a20332acc78e94e2e7acd207c4fffc
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jan 26 14:28:12 2010 +0100

    s3-docs: Adapt version in man ldbrename.
    
    Karolin
    (cherry picked from commit 69100db8c331ed15651ae52b88632d047f148ae4)

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

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

commit 8e2eecefa7f5d8250cc4a8e379b761cea21b38ee
Author: William Jojo <w.jojo at hvcc.edu>
Date:   Thu Jan 21 14:21:03 2010 +0100

    s3: Fix bug 7052: "DFS broken on AIX (maybe others)"
    (cherry picked from commit c531d00ab4444db19ff6ba4c60ebdcc8319949c6)
    (cherry picked from commit f21796955e7aa2e84a1c810612f2fdee2bde611c)
    (cherry picked from commit 28b3cf328312a26cd72bbc54f3283bc46b51bc32)

commit 2e75a6aa742cccf5bacfd4055ba6ab0816121c4b
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Jan 20 13:34:50 2010 +0100

    s3-docs: Fix typos.
    
    Thanks to the Debian samba package maintainers
    <pkg-samba-maint at lists.alioth.debian.org> for providing the patch!
    
    Fix bug #7017 (Typos and spelling errors in manpages).
    
    Karolin
    (cherry picked from commit e1e6b19acff6d8ba3b70c3ab474a85de8b6f6a6c)
    (cherry picked from commit eaa10cfec3c389c79ac3c43f7ec1596015a9b8e1)
    (cherry picked from commit 436e13608e489b4bd5c00597efca9c9ca66b8be1)

commit 90b0ff53eb43e0eada728eb3fb02d231c62071fc
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 5 13:30:42 2010 +0100

    s3:pdb_ldap: restore Samba 3.0.x behavior and use the first "uid" value.
    
    See bug #6157 for more details.
    
    metze
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 25806f43ddee7e2653e907eea2c6fcc075960fa1)
    (cherry picked from commit ac224452b94865db346ed68dc517f84d40e6303c)
    (cherry picked from commit 20a405288fb1b33c43b31b170f1acc9c82732208)

commit 35aa00bbfa72a87234251eeefeacaada2798afd0
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 5 13:30:19 2010 +0100

    s3:smbldap: add smbldap_talloc_first_attribute()
    
    metze
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit c992127f8a96c37940a6d298c7c6859c47f83d9b)
    (cherry picked from commit 915b7552b71904baf6a452bdc1649e76d8286a14)
    (cherry picked from commit 6402321d5bbbb28b335787856b16c3d8556e8e0a)

commit 17e7a47c95ebad96ffe96ee64ad6eaa960dae361
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jan 19 11:41:24 2010 +0100

    WHATSNEW: Start release notes for Samba 3.4.6.
    
    Karolin
    (cherry picked from commit bcb4da881426d1e863582aab8c455430f3a224f0)

commit 3cba662e696f417204af54ccfdaf43ddf8a7117b
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jan 19 11:39:23 2010 +0100

    VERSION: Raise version number up to 3.4.6.
    
    Karolin
    (cherry picked from commit febac98cadd14ece58f3df99ce7670d41c046e3d)

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

Summary of changes:
 WHATSNEW.txt                                       |  111 ++++++-
 docs-xml/manpages-3/eventlogadm.8.xml              |    2 +-
 docs-xml/manpages-3/ldbrename.1.xml                |    3 +
 docs-xml/manpages-3/ntlm_auth.1.xml                |    2 +-
 docs-xml/manpages-3/smbd.8.xml                     |    2 +-
 docs-xml/manpages-3/winbindd.8.xml                 |    2 +-
 docs-xml/smbdotconf/browse/preferredmaster.xml     |    2 +-
 docs-xml/smbdotconf/misc/widelinks.xml             |   13 +-
 docs-xml/smbdotconf/protocol/largereadwrite.xml    |    2 +-
 docs-xml/smbdotconf/protocol/unixextensions.xml    |    4 +
 .../smbdotconf/winbind/winbindnormalizenames.xml   |    2 +-
 lib/util/binsearch.h                               |   68 ++++
 nsswitch/pam_winbind.c                             |   12 +
 source3/VERSION                                    |    2 +-
 source3/auth/auth_util.c                           |    8 +
 source3/client/cifs.upcall.c                       |    5 +-
 source3/configure.in                               |    4 +-
 source3/include/proto.h                            |    1 +
 source3/include/smb.h                              |    3 +-
 source3/include/smbldap.h                          |    8 +
 source3/lib/smbldap.c                              |   34 ++
 source3/lib/system.c                               |   65 ++++-
 source3/libsmb/clirap.c                            |   31 ++-
 source3/locale/pam_winbind/ar.po                   |    4 +-
 source3/locale/pam_winbind/cs.po                   |    2 +-
 source3/locale/pam_winbind/da.po                   |    2 +-
 source3/locale/pam_winbind/es.po                   |    4 +-
 source3/locale/pam_winbind/fi.po                   |    4 +-
 source3/locale/pam_winbind/fr.po                   |    4 +-
 source3/locale/pam_winbind/hu.po                   |    2 +-
 source3/locale/pam_winbind/it.po                   |    4 +-
 source3/locale/pam_winbind/ja.po                   |    4 +-
 source3/locale/pam_winbind/ko.po                   |    2 +-
 source3/locale/pam_winbind/nb.po                   |    4 +-
 source3/locale/pam_winbind/nl.po                   |    4 +-
 source3/locale/pam_winbind/pl.po                   |    4 +-
 source3/locale/pam_winbind/pt_BR.po                |    2 +-
 source3/locale/pam_winbind/ru.po                   |    4 +-
 source3/locale/pam_winbind/sv.po                   |    4 +-
 source3/locale/pam_winbind/zh_CN.po                |    4 +-
 source3/locale/pam_winbind/zh_TW.po                |    2 +-
 source3/m4/check_path.m4                           |    4 +-
 source3/modules/vfs_expand_msdfs.c                 |   18 +-
 source3/param/loadparm.c                           |   35 ++-
 source3/passdb/login_cache.c                       |   25 +-
 source3/passdb/passdb.c                            |    4 +
 source3/passdb/pdb_get_set.c                       |   45 +++-
 source3/passdb/pdb_interface.c                     |    3 +-
 source3/passdb/pdb_ldap.c                          |  355 +++++++++++++++++---
 source3/rpc_server/srv_spoolss_nt.c                |  104 ++++++-
 source3/smbd/ipc.c                                 |    3 +
 source3/smbd/lanman.c                              |  234 ++++++++++++-
 source3/smbd/server.c                              |    8 +
 source3/smbd/service.c                             |   58 ++--
 source3/smbd/trans2.c                              |   37 --
 source3/smbd/vfs.c                                 |    2 +-
 source3/web/cgi.c                                  |    3 +-
 tests/readlink.c                                   |    2 +-
 58 files changed, 1180 insertions(+), 206 deletions(-)
 create mode 100644 lib/util/binsearch.h


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 1fa0358..a0ddb70 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,111 @@
                    =============================
+                   Release Notes for Samba 3.4.6
+			 February 24, 2010
+                   =============================
+
+
+This is the latest stable release of Samba 3.4.
+
+Major enhancements in Samba 3.4.6 include:
+
+   o "wide links" and "unix extensions" are incompatible (bug #7104).
+   o Fix core dump on Ubuntu 8.04 64 bit (bug #7063).
+   o Fix failing of smbd to respond to a read or a write caused by
+     Linux asynchronous IO (aio) (bug #7067).
+   o Fix string buffer overflow causing heap corruption in smbd (bug #7096).
+
+
+######################################################################
+Changes
+#######
+
+Changes since 3.4.5
+-------------------
+
+
+o   Michael Adam <obnox at samba.org>
+    * Make idmap cache persistent for "ldapsam:trusted".
+    * Also fill the memcache with sid<->id mappings in ldapsam_sid_to_id() not
+      only the persistent idmap cache.
+    * Shortcut uid_to_sid when "ldapsam:trusted = yes".
+
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 7063: Fix core dump on Ubuntu 8.04 64 bit.
+    * BUG 7067: Fix failing of smbd to respond to a read or a write caused by
+      Linux asynchronous IO (aio).
+    * BUG 7072: Fix unlocking of accounts from ldap.
+    * BUG 7081: Fix vfs_expand_msdfs.
+    * BUG 7104: "wide links" and "unix extensions" are incompatible.
+    * BUG 7122: Fix reading of large browselist.
+
+
+o   Steven Danneman <steven.danneman at isilon.com>
+    * BUG 7096: Fix string buffer overflow causing heap corruption in smbd.
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 7130: Fix listing of printjobs in Windows 7.
+    * BUG 7136: Sspoolss getprinterdriver2 level 101 marshalling is bad.
+
+
+o   William Jojo <w.jojo at hvcc.edu>
+    * BUG 7052: Fix DFS on AIX (maybe others).
+
+
+o   Jeff Layton <jlayton at redhat.com>
+    * BUG 6868: Fix crash bug in 'cifs.upcall'.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 5885: Fix bogus ip address in SWAT.
+    * BUG 6981: Fix large paged search with DirX LDAP servers.
+    * BUG 7068: Fix pdb_search crash as non-root user.
+    * Make pdb_copy_sam_account also copy the group sid.
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * BUG 6157: Use the first "uid" value.
+    * BUG 7098: Fix results of 'smbclient -L' with a large browse list.
+    * Shortcut gid_to_sid when "ldapsam:trusted = yes".
+    * Speed up pdb_get_group_sid().
+    * Try to build the full unix_pw structure with ldapsam:trusted support.
+    * Optimize ldapsam_alias_memberships() and cache ldap searches.
+
+
+o   Lars Müller <lars at samba.org>
+    * BUG 7047: Add cross option to samba_cv_linux_getgrouplist_ok.
+    * BUG 7102: Normalize "Changing password for" msg IDs and STRs.
+
+
+o   Bo Yang <boyang at samba.org>
+    * BUG 7106: Fix malformed require_membership_of_sid.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.4 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older versions follow:
+----------------------------------------
+
+                   =============================
                    Release Notes for Samba 3.4.5
 			 January 19, 2010
                    =============================
@@ -65,8 +172,8 @@ database (https://bugzilla.samba.org/).
 ======================================================================
 
 
-Release notes for older versions follow:
-----------------------------------------
+----------------------------------------------------------------------
+
 
                    =============================
                    Release Notes for Samba 3.4.4
diff --git a/docs-xml/manpages-3/eventlogadm.8.xml b/docs-xml/manpages-3/eventlogadm.8.xml
index 0a6272d..a6cc5e8 100644
--- a/docs-xml/manpages-3/eventlogadm.8.xml
+++ b/docs-xml/manpages-3/eventlogadm.8.xml
@@ -111,7 +111,7 @@
 		<varlistentry>
 		<term>
 		<option>-o</option>
-		<literal>write</literal>
+		<literal>dump</literal>
 		<replaceable>EVENTLOG</replaceable>
 		<replaceable>RECORD_NUMBER</replaceable>
 		</term>
diff --git a/docs-xml/manpages-3/ldbrename.1.xml b/docs-xml/manpages-3/ldbrename.1.xml
index 391ec84..8567cd4 100644
--- a/docs-xml/manpages-3/ldbrename.1.xml
+++ b/docs-xml/manpages-3/ldbrename.1.xml
@@ -5,6 +5,9 @@
 <refmeta>
 	<refentrytitle>ldbrename</refentrytitle>
 	<manvolnum>1</manvolnum>
+        <refmiscinfo class="source">Samba</refmiscinfo>
+        <refmiscinfo class="manual">User Commands</refmiscinfo>
+        <refmiscinfo class="version">3.4</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index 8675582..edd1e11 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -35,7 +35,7 @@
 	users using NT/LM authentication. It returns 0 if the users is authenticated
 	successfully and 1 if access was denied. ntlm_auth uses winbind to access 
 	the user and authentication data for a domain.  This utility 
-	is only indended to be used by other programs (currently
+	is only intended to be used by other programs (currently
 	<ulink url="http://www.squid-cache.org/">Squid</ulink>
 	and <ulink url="http://download.samba.org/ftp/unpacked/lorikeet/trunk/mod_ntlm_winbind/">mod_ntlm_winbind</ulink>)
 	</para>
diff --git a/docs-xml/manpages-3/smbd.8.xml b/docs-xml/manpages-3/smbd.8.xml
index 67ec6a1..b0508fa 100644
--- a/docs-xml/manpages-3/smbd.8.xml
+++ b/docs-xml/manpages-3/smbd.8.xml
@@ -120,7 +120,7 @@
 		<listitem><para>If this parameter is specified it causes the
 		server to run "interactively", not as a daemon, even if the
 		server is executed on the command line of a shell. Setting this
-		parameter negates the implicit deamon mode when run from the
+		parameter negates the implicit daemon mode when run from the
 		command line. <command>smbd</command> also logs to standard
 		output, as if the <command>-S</command> parameter had been
 		given.
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index c681da8..b1e3465 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -53,7 +53,7 @@
         <para> The Name Service Switch allows user
 	and system information to be obtained from different databases
 	services such as NIS or DNS.  The exact behaviour can be configured
-	throught the <filename>/etc/nsswitch.conf</filename> file.
+	through the <filename>/etc/nsswitch.conf</filename> file.
 	Users and groups are allocated as they are resolved to a range
 	of user and group ids specified by the administrator of the
 	Samba system.</para>
diff --git a/docs-xml/smbdotconf/browse/preferredmaster.xml b/docs-xml/smbdotconf/browse/preferredmaster.xml
index edddae8..9dcffb4 100644
--- a/docs-xml/smbdotconf/browse/preferredmaster.xml
+++ b/docs-xml/smbdotconf/browse/preferredmaster.xml
@@ -16,7 +16,7 @@
 	parameter is used in conjunction with <smbconfoption name="domain master">yes</smbconfoption>, so that
 	<command moreinfo="none">nmbd</command> can guarantee becoming a domain master.
 	</para>
-		
+
 	<para>
 	Use this option with caution, because if there are several hosts (whether Samba servers, Windows 95 or NT)
 	that are preferred  master browsers on the same subnet, they will each periodically  and continuously attempt
diff --git a/docs-xml/smbdotconf/misc/widelinks.xml b/docs-xml/smbdotconf/misc/widelinks.xml
index fb707c1..1c30bb7 100644
--- a/docs-xml/smbdotconf/misc/widelinks.xml
+++ b/docs-xml/smbdotconf/misc/widelinks.xml
@@ -9,10 +9,15 @@
 	server are always allowed; this parameter controls access only 
 	to areas that are outside the directory tree being exported.</para>
 
-	<para>Note that setting this parameter can have a negative 
-	effect on your server performance due to the extra system calls 
-	that Samba has to  do in order to perform the link checks.</para>
+	<para>Note: Turning this parameter on when UNIX extensions are enabled
+	will allow UNIX clients to create symbolic links on the share that
+	can point to files or directories outside restricted path exported
+	by the share definition. This can cause access to areas outside of
+	the share. Due to this problem, this parameter will be automatically
+	disabled (with a message in the log file) if the
+	<smbconfoption name="unix extensions"/> option is on.
+	</para>
 </description>
 
-<value type="default">yes</value>
+<value type="default">no</value>
 </samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/largereadwrite.xml b/docs-xml/smbdotconf/protocol/largereadwrite.xml
index 12be741..0b4158d 100644
--- a/docs-xml/smbdotconf/protocol/largereadwrite.xml
+++ b/docs-xml/smbdotconf/protocol/largereadwrite.xml
@@ -7,7 +7,7 @@
     <para>This parameter determines whether or not
     <citerefentry><refentrytitle>smbd</refentrytitle>
     <manvolnum>8</manvolnum></citerefentry> supports the new 64k
-    streaming read and write varient SMB requests introduced with
+    streaming read and write variant SMB requests introduced with
     Windows 2000. Note that due to Windows 2000 client redirector bugs
     this requires Samba to be running on a 64-bit capable operating
     system such as IRIX, Solaris or a Linux 2.4 kernel. Can improve
diff --git a/docs-xml/smbdotconf/protocol/unixextensions.xml b/docs-xml/smbdotconf/protocol/unixextensions.xml
index da9ad10..d816648 100644
--- a/docs-xml/smbdotconf/protocol/unixextensions.xml
+++ b/docs-xml/smbdotconf/protocol/unixextensions.xml
@@ -10,6 +10,10 @@
     by supporting features such as symbolic links, hard links, etc...
     These extensions require a similarly enabled client, and are of
     no current use to Windows clients.</para>
+    <para>
+    Note if this parameter is turned on, the <smbconfoption name="wide links"/>
+    parameter will automatically be disabled.
+    </para>
 </description>
 
 <value type="default">yes</value>
diff --git a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
index ba71686..3bcdeca 100644
--- a/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnormalizenames.xml
@@ -20,7 +20,7 @@
 	  version.  Please refer to the manpage for the configured
 	  idmap and nss_info plugin for the specifics on how to configure
 	  name aliasing for a specific configuration.  Name aliasing takes
-	  precendence (and is mutually exclusive) over the whitespace
+	  precedence (and is mutually exclusive) over the whitespace
 	  replacement mechanism discussed previsouly.
 	  </para>
 
diff --git a/lib/util/binsearch.h b/lib/util/binsearch.h
new file mode 100644
index 0000000..ac83990
--- /dev/null
+++ b/lib/util/binsearch.h
@@ -0,0 +1,68 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   a generic binary search macro
+
+   Copyright (C) Andrew Tridgell 2009
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _BINSEARCH_H
+#define _BINSEARCH_H
+
+/* a binary array search, where the array is an array of pointers to structures,
+   and we want to find a match for 'target' on 'field' in those structures.
+
+   Inputs:
+      array:          base pointer to an array of structures
+      arrray_size:    number of elements in the array
+      field:          the name of the field in the structure we are keying off
+      target:         the field value we are looking for
+      comparison_fn:  the comparison function
+      result:         where the result of the search is put
+
+   if the element is found, then 'result' is set to point to the found array element. If not,
+   then 'result' is set to NULL.
+
+   The array is assumed to be sorted by the same comparison_fn as the
+   search (with, for example, qsort)
+ */
+#define BINARY_ARRAY_SEARCH_P(array, array_size, field, target, comparison_fn, result) do { \
+	int32_t _b, _e; \
+	(result) = NULL; \
+	if (array_size) { for (_b = 0, _e = (array_size)-1; _b <= _e; ) { \
+		int32_t _i = (_b+_e)/2; \
+		int _r = comparison_fn(target, array[_i]->field); \
+		if (_r == 0) { (result) = array[_i]; break; } \
+		if (_r < 0) _e = _i - 1; else _b = _i + 1; \
+	}} } while (0)
+
+/*
+  like BINARY_ARRAY_SEARCH_P, but assumes that the array is an array
+  of structures, rather than pointers to structures
+
+  result points to the found structure, or NULL
+ */
+#define BINARY_ARRAY_SEARCH(array, array_size, field, target, comparison_fn, result) do { \
+	int32_t _b, _e; \
+	(result) = NULL; \
+	if (array_size) { for (_b = 0, _e = (array_size)-1; _b <= _e; ) {	\
+		int32_t _i = (_b+_e)/2; \
+		int _r = comparison_fn(target, array[_i].field); \
+		if (_r == 0) { (result) = &array[_i]; break; } \
+		if (_r < 0) _e = _i - 1; else _b = _i + 1; \
+	}} } while (0)
+
+#endif
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index ec05f75..b411eb7 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -1036,6 +1036,7 @@ static bool winbind_name_list_to_sid_string_list(struct pwb_context *ctx,
 	char *current_name = NULL;
 	const char *search_location;
 	const char *comma;
+	int len;
 
 	if (sid_list_buffer_size > 0) {
 		sid_list_buffer[0] = 0;
@@ -1091,6 +1092,17 @@ static bool winbind_name_list_to_sid_string_list(struct pwb_context *ctx,
 		_make_remark_format(ctx, PAM_TEXT_INFO, _("Cannot convert group %s "
 				"to sid, please contact your administrator to see "
 				"if group %s is valid."), search_location, search_location);
+		/*
+		 * The lookup of the last name failed..
+		 * It results in require_member_of_sid ends with ','
+		 * It is malformated parameter here, overwrite the last ','.
+		 */
+		len = strlen(sid_list_buffer);
+		if (len) {
+			if (sid_list_buffer[len - 1] == ',') {
+				sid_list_buffer[len - 1] = '\0';
+			}
+		}
 	}
 
 	result = true;
diff --git a/source3/VERSION b/source3/VERSION
index a7d0bbf..7133dfb 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=4
-SAMBA_VERSION_RELEASE=5
+SAMBA_VERSION_RELEASE=6
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index b743c12..89aa4a3 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -2176,6 +2176,14 @@ bool is_trusted_domain(const char* dom_name)
 	if ( lp_server_role() == ROLE_STANDALONE )
 		return False;
 
+	if (dom_name == NULL || dom_name[0] == '\0') {
+		return false;
+	}
+
+	if (strequal(dom_name, get_global_sam_name())) {
+		return false;
+	}
+
 	/* if we are a DC, then check for a direct trust relationships */
 
 	if ( IS_DC ) {
diff --git a/source3/client/cifs.upcall.c b/source3/client/cifs.upcall.c
index 1617e0e..d573e76 100644
--- a/source3/client/cifs.upcall.c
+++ b/source3/client/cifs.upcall.c
@@ -55,6 +55,7 @@ get_tgt_time(const char *ccname) {
 	krb5_principal principal;
 	time_t credtime = 0;
 	char *realm = NULL;
+	TALLOC_CTX *mem_ctx;
 
 	if (krb5_init_context(&context)) {
 		syslog(LOG_DEBUG, "%s: unable to init krb5 context", __func__);
@@ -86,9 +87,10 @@ get_tgt_time(const char *ccname) {
 		goto err_ccstart;
 	}
 
+	mem_ctx = talloc_init("cifs.upcall");
 	while (!credtime && !krb5_cc_next_cred(context, ccache, &cur, &creds)) {
 		char *name;
-		if (smb_krb5_unparse_name(NULL, context, creds.server, &name)) {
+		if (smb_krb5_unparse_name(mem_ctx, context, creds.server, &name)) {
 			syslog(LOG_DEBUG, "%s: unable to unparse name", __func__);
 			goto err_endseq;
 		}
@@ -101,6 +103,7 @@ get_tgt_time(const char *ccname) {
 		TALLOC_FREE(name);
         }
 err_endseq:
+	TALLOC_FREE(mem_ctx);
         krb5_cc_end_seq_get(context, ccache, &cur);
 err_ccstart:
 	krb5_free_principal(context, principal);
diff --git a/source3/configure.in b/source3/configure.in
index 1034509..be18c24 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1243,7 +1243,9 @@ main() {
 #endif
        exit(0);
 }
-], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
+], [linux_getgrouplist_ok=yes],
+   [linux_getgrouplist_ok=no],
+   [linux_getgrouplist_ok=cross])
        if test x"$linux_getgrouplist_ok" = x"yes"; then
           AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
        fi
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d2ae62c..b241437 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4358,6 +4358,7 @@ void lp_set_posix_default_cifsx_readwrite_locktype(enum brl_flavour val);
 int lp_min_receive_file_size(void);
 char* lp_perfcount_module(void);
 void lp_set_passdb_backend(const char *backend);
+void widelinks_warning(int snum);
 
 /* The following definitions come from param/util.c  */
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2a3c455..29c614b 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1690,7 +1690,8 @@ minimum length == 24.
 enum smbd_capability {
     KERNEL_OPLOCK_CAPABILITY,
     DMAPI_ACCESS_CAPABILITY,
-    LEASE_CAPABILITY
+    LEASE_CAPABILITY,
+    KILL_CAPABILITY
 };
 
 /*
diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
index 3ac770a..7383670 100644
--- a/source3/include/smbldap.h
+++ b/source3/include/smbldap.h
@@ -196,6 +196,11 @@ struct ldapsam_privates {
 
 	/* ldap server location parameter */
 	char *location;
+
+	struct {
+		char *filter;
+		LDAPMessage *result;
+	} search_cache;
 };
 
 /* Functions shared between pdb_ldap.c and pdb_nds.c. */
@@ -211,6 +216,9 @@ const char** get_userattr_list( TALLOC_CTX *mem_ctx, int schema_ver );
 char * smbldap_talloc_single_attribute(LDAP *ldap_struct, LDAPMessage *entry,
 				       const char *attribute,
 				       TALLOC_CTX *mem_ctx);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list