[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.8_ctdb.56-79-gcd591b3

Michael Adam obnox at samba.org
Tue Mar 31 13:31:19 GMT 2009


The branch, v3-2-ctdb has been updated
       via  cd591b396eeaee4d8ca5afbdc59b80d7ca496968 (commit)
       via  98870112bd9cb515c4dd647b44684244a0fcd208 (commit)
       via  51d7dbdd262305b65ec522f36b78823c252c82b1 (commit)
       via  e2afefde3450b6f542b6d7d1164cdcfdbdc03e81 (commit)
       via  cddfcff865c960cf18a3e9ec744108e7c03553e8 (commit)
       via  18b1b84d040861f40c3e4d52a8a951acf54f6c4d (commit)
       via  a681e8b4c1b722ead97130cce78bfa7bca1ee1f2 (commit)
       via  7deaf86a3ad40db3e71922615432616cd715b1ca (commit)
       via  e3e4a081e68d4e6c661cbe4ced03be3ff633737e (commit)
       via  856e2d008f627c771e80b7c51395a789af5d9335 (commit)
       via  6a8de03a197ce86ae6a7d214146cb206fb0d787f (commit)
       via  e3ecb1b3156780653b9c99179ae1bccd15aa16ee (commit)
       via  5c768ee4c866831cb6e500f3812d04fd1ee575f0 (commit)
       via  92967b571266ea09b5e90a5927c066bbbe81e9df (commit)
       via  a78d8501e444f3d924b788dd0d9e1a8c70d16f69 (commit)
       via  c9e0f0b5c480191a28dad3ea46c12da4988cb977 (commit)
       via  a9b68ac02f358c6c9d882303c9af66cbe178851b (commit)
       via  047706678d2ddf98c9efd43551c72e941610efd4 (commit)
       via  3d5652d419c8965f1ce21b5ece089c2005183b3b (commit)
       via  ae3e0e2e8f1e83f67e292c238603d40c8ada5eb2 (commit)
       via  db7a71ffc58beede30a0142b18ddd1d11c06fc44 (commit)
       via  26682d2beb254cdb309f4a3bce123844dd8bf58d (commit)
       via  ecaaf9678ba746b5138d0effca98e7c624e63708 (commit)
       via  561ca21a1f577a97bb93a195102cdcc49b482eb7 (commit)
       via  8cb2184e1f4b6cbba4ed63bdb4db26e1fa0287ef (commit)
       via  a2bf31d1389579c8d25ffb38d3e10b8cbddf685f (commit)
       via  94170481ee937ffe5ba191861bf2b2685d9ba47d (commit)
       via  65d56e8e20b1500c07b62759eea7096eefd73737 (commit)
       via  32737f1d62c74fd1d27b9199144ff908b42387e8 (commit)
       via  1a9b79625d708920725039bd9a2c2890d49c81aa (commit)
       via  4397e68633c680c7717b59f718b237aa067620e1 (commit)
       via  86885d659440706005c6166e848cedadb6959c9f (commit)
       via  785e107e95dd2c28ad83026e42bfe7bc44fc2bd4 (commit)
       via  f8bf0cc7337af0993d105ab7a0aac8c807814cf5 (commit)
       via  98da25cee03d5aa095e5d283f7d5068543c3c66f (commit)
       via  24e68bbacc3499558eda9e40d921640014fc0e43 (commit)
       via  cb46dd0597bc05b7d54a55458428c35c469f1b5c (commit)
       via  71473172f09d05fdd2516d9dbb9dddf7d52c5381 (commit)
       via  e2fd37cbe001e71e6ea0ee590583036fb0e8af25 (commit)
       via  a17136b7cc4ecfbeae1779572403abd13cfd0f14 (commit)
       via  3a08af8e78f4822ea6a08b53f6129e464c66dfab (commit)
       via  60fd978cf999a5eddacf49e5366c551999864e50 (commit)
       via  666dabc0161b4fb5c872b4fbc1229a27533b6af0 (commit)
      from  dd23148118fb058b65748cc5fda47474aa8515eb (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb


- Log -----------------------------------------------------------------
commit cd591b396eeaee4d8ca5afbdc59b80d7ca496968
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Mar 31 10:44:20 2009 +0200

    VERSION: Raise version number up to 3.2.9.
    
    Karolin
    (cherry picked from commit d999a7e99804bf71f62c905452a720c20016f8e9)

commit 98870112bd9cb515c4dd647b44684244a0fcd208
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Mar 31 10:43:47 2009 +0200

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

commit 51d7dbdd262305b65ec522f36b78823c252c82b1
Author: Michael Adam <obnox at samba.org>
Date:   Tue Mar 31 14:10:19 2009 +0200

    v3-2-ctdb: bump ctdb vendor patch level for next release
    
    Michael

commit e2afefde3450b6f542b6d7d1164cdcfdbdc03e81
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 27 21:26:56 2009 -0700

    Fix the problem of 3.0.x passdb databases being version
    3 but using a different hash calculation than 3.2.x passwd
    databases (also version 3). Introduces a minor version
    number.
    Jeremy.
    (cherry picked from commit 10b518592e616ecfaadd829ecd0674a04510b422)

commit cddfcff865c960cf18a3e9ec744108e7c03553e8
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 27 12:11:24 2009 -0700

    Fix bug #6195 - Migrating from 3.0.x to 3.3.x can fail to update passdb.tdb correctly. For the clustering case.
    Clustered setups should have only ever used
    the unsigned version of TDB_DATA in the
    first place so they can't be in this mess :-).
    Just do the normal upgrade in the clustered case.
    Jeremy.
    (cherry picked from commit 58d3ec1cb81d6086d65cd12acd16cd591cf0c71f)

commit 18b1b84d040861f40c3e4d52a8a951acf54f6c4d
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Mar 18 14:31:01 2009 -0700

    Fix bug 6195 - Migrating from 3.0.x to 3.3.x can fail to update passdb.tdb correctly.
    This is a really nasty one to fix as in order to successfully update the
    passdb.tdb we must do the equivalent of a tdbbackup to move to the new hash
    values before we do the upgrade.
    Jeremy.

commit a681e8b4c1b722ead97130cce78bfa7bca1ee1f2
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Mar 30 15:09:10 2009 -0700

    Ensure files starting with multiple dots are hidden
    if "hide dot files" is set. Thanks to Barry Kelly <bkelly.ie at gmail.com>
    for pointing this one out.
    Jeremy.
    (cherry picked from commit 5bdc16a867b9c14682b327c79f79834edcd6842d)

commit 7deaf86a3ad40db3e71922615432616cd715b1ca
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Mar 30 12:43:17 2009 +0200

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

commit e3e4a081e68d4e6c661cbe4ced03be3ff633737e
Author: Derrell Lipman <derrell at dworkin.(none)>
Date:   Fri Mar 27 17:10:04 2009 -0400

    [Bug 6228] SMBC_open_ctx failure due to path resolve failure doesn't set errno
    
    Fixed.
    
    It turns out there were a number of places where cli_resolve_path() was called
    and the error path upon that function failing did not set errno. There were a
    couple of places the failure handling code did set errno to ENOENT, so I made
    them all consistent, although I think better errno choices for this condition
    exist, e.g.  EHOSTUNREACH.
    
    Derrell
    (cherry picked from commit f4e68b09a6ba30d968bccfad8bf6b67b4456b111)

commit 856e2d008f627c771e80b7c51395a789af5d9335
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Mar 27 14:04:38 2009 +0100

    WHATSNEW: Update changes since 3.2.8.
    
    Karolin
    (cherry picked from commit 7fa853e490be446a6da2086e1749b59a8f741e09)

commit 6a8de03a197ce86ae6a7d214146cb206fb0d787f
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 26 15:33:39 2009 -0700

    Try and fix the build farm RAW-STREAMS errors. Ordering of
    modules shouldn't matter, so as vfs_streams_depot doesn't
    implement get/setxattrs then call into the full VFS stack
    at the top.
    Jeremy
    (cherry picked from commit a1d9b31a0c8a38dbfa94f578830d5d35695aff3b)

commit e3ecb1b3156780653b9c99179ae1bccd15aa16ee
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 26 12:13:28 2009 -0700

    Fix bug #6224 - nmbd waits 5 minutes at startup before checking if it needs to run elections
    Fix logic bug that causes nmbd to wait 5 minutes before
    looking for a master browser. This one is *old* :-). Thanks
    for Simo for bugging me on this.
    Jeremy.
    (cherry picked from commit 857c2e4407a0f4fcee721372ffed5366bc3051f9)

commit 5c768ee4c866831cb6e500f3812d04fd1ee575f0
Author: Tim Prouty <tprouty at samba.org>
Date:   Thu Mar 26 11:28:37 2009 -0700

    s3: parse_packet can return NULL which is then dereferenced in match_mailslot_name
    (cherry picked from commit d097e3f918853cf642c4a51f6ed3a4d8c85d283e)

commit 92967b571266ea09b5e90a5927c066bbbe81e9df
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 26 12:24:50 2009 +0100

    Fix a scary "fill_share_mode_lock failed" message
    
    To me "fill_share_mode_lock failed" is a "can't happen" alert. There is
    however a perfectly valid case in get_file_infos() when the file is not open.
    
    Change the corresponding debug message to level 10 and explain more.
    (cherry picked from commit f73d4cf1fcfd8f9e2543a222faed133472fd890c)

commit a78d8501e444f3d924b788dd0d9e1a8c70d16f69
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 26 10:41:11 2009 +0100

    s3-net: Fix Bug #6102. NetQueryDisplayInformation could return wrong information.
    
    Guenther
    (cherry picked from commit 490ed838f2626893bb623ea6ad8d79595c8c44c4)

commit c9e0f0b5c480191a28dad3ea46c12da4988cb977
Author: Günther Deschner <gd at samba.org>
Date:   Wed Mar 25 17:06:57 2009 +0100

    s3-net: Fix Bug #6193: avoid messing with sync_context in fetch_database_to_ldif().
    
    We absolutely need to avoid messing with the sync_context as that breaks the
    stream of replication data coming from the DC (only replicates ~350 instead of
    ~4000 groups).
    
    Guenther
    (cherry picked from commit 1a1823c357fb8e01ac0e8c8749e6f5004bf3cf3e)

commit a9b68ac02f358c6c9d882303c9af66cbe178851b
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 24 15:34:13 2009 -0700

    winbind_pam: fix gcc 4.4 compile warning
    (cherry picked from commit 4a99f2f006e6324cf38b68f0f390daf52f24b1b3)

commit 047706678d2ddf98c9efd43551c72e941610efd4
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 24 15:29:35 2009 -0700

    Fix two memleaks in the encryption code
    
    ntlmssp_seal_packet creates its own signature data blob, which we then
    have to free.
    
    Jeremy, please check and merge appropriately (Yes, I'm asking you to do the
    janitor work, I want you to *look* at this :-))
    
    Volker
    (cherry picked from commit 525af716cd52500a4e3dccf9eeb9ea85f86be7ca)

commit 3d5652d419c8965f1ce21b5ece089c2005183b3b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 24 11:50:49 2009 -0700

    s3:smbd: if we allow trans2 on the IPC$ share, then we have to allow transs2 too.
    
    Otherwise we'll confuse the client signing engine, when we reply an error to each transs2.
    
    metze
    (cherry picked from commit e217138a36b1ba1eff164aecfa52ba6fe8864747)

commit ae3e0e2e8f1e83f67e292c238603d40c8ada5eb2
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 24 11:07:16 2009 +0100

    Fix bug 6097
    
    A client sent a SID with authority 0 and 0 sub-authorities. W2k3 replies with
    NT_STATUS_INVALID_SID, even if other SIDs in the list are valid.
    
    Thanks to Pavel <wylda at volny.cz> for the bug report!
    (cherry picked from commit bb76066e8797599e5ca75821a686e32dd0c97a74)

commit db7a71ffc58beede30a0142b18ddd1d11c06fc44
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Mar 23 12:26:03 2009 +0100

    s3:dsgetdcname: use parentheses in if condition to make negation clear
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit 87b428e424e2e3cca975ecd0efed327e72950a1d)
    (cherry picked from commit ca58d12b6513beb40c14fcab2758cf21af0179f3)

commit 26682d2beb254cdb309f4a3bce123844dd8bf58d
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 20 11:11:04 2009 +0100

    s3-krb5: Fix Coverity #762 (REVERSE_INULL).
    
    Guenther
    (cherry picked from commit 97190ae184dff6450b1390c854f7426e2ee3f980)
    (cherry picked from commit 0f7757e94bfa35d22a7349d78578685c0dba22d7)
    (cherry picked from commit 66faa809847ad60b8027ae86068f8d62c0d181ed)

commit ecaaf9678ba746b5138d0effca98e7c624e63708
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 19 16:42:54 2009 +0100

    s3-krb5: Fix Coverity #722 (RESOURCE_LEAK).
    
    Guenther
    (cherry picked from commit 1524abd8bf12d82e1fb0063585fc9a465fc7bf9c)
    (cherry picked from commit 3517388b5d5439ffe3f9629aaf826fa1dfbb4ba7)
    (cherry picked from commit 5ce5a9bea994d7db3d352d0800333d0fd0b833df)

commit 561ca21a1f577a97bb93a195102cdcc49b482eb7
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Mar 18 07:56:51 2009 +0100

    s3:libsmb: fix smb signing for fragmented trans/trans2/nttrans requests
    
    Before we send the secondary requests we need to remove the
    old mid=>seqnum mapping and reset cli->mid and make the new
    mid=>seqnum mapping "persistent".
    
    The bug we had in cli_send_trans was this:
    The first cli_send_smb() incremented cli->mid
    and the secondary requests used the incremented mid,
    but as cli->outbuf still had the correct mid,
    we send the correct mid to the server. The real problem
    was that the cli_send_smb() function stored the seqnum
    under the wrong mid.
    
    cli_send_nttrans() was totally broken and now follows the
    same logic as cli_send_trans().
    
    The good thing is that in practice the problem is unlikely to happen,
    because max_xmit is large enough to avoid secondary requests.
    
    metze
    (cherry picked from commit 880fbc4e8cd67de73c4bcda94489eb1e1422a04b)
    (cherry picked from commit 70466990b4b7c68ae95dbbcf741cd3f41f2dd0b3)
    (cherry picked from commit d01cca5e3ddb925696d49a1ea728013ec1032372)
    (cherry picked from commit 6c13360e195189f7afc70c5fda6ef27f46145b0b)

commit 8cb2184e1f4b6cbba4ed63bdb4db26e1fa0287ef
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Mar 16 01:51:09 2009 +0100

    fix build on old Heimdal based systems
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit 011ad7245d53a716c4c766f5ef8d317bb3a53d0f)
    (cherry picked from commit 5eaa2541f19277bc00c47b944739c6732f90809b)

commit a2bf31d1389579c8d25ffb38d3e10b8cbddf685f
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Mar 18 20:54:13 2009 -0700

    Allow DFS client paths to work when POSIX pathnames have been
    selected (we need to path in pathname /that/look/like/this).
    Jeremy.
    (cherry picked from commit 0c11c2deee7ab9d281df6df91b793b7f1c1764a4)

commit 94170481ee937ffe5ba191861bf2b2685d9ba47d
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Mar 18 19:58:01 2009 -0700

    Fix bug #6196 - Unable to serve files with colons to Linux CIFS/VFS client
    Looks like the pathname parsing for POSIX paths got
    broken when the code for doing Windows streams parsing got added.
    Jeremy.
    (cherry picked from commit 985ba585207e840caa17c3d87d93ef1ba5f15cbb)

commit 65d56e8e20b1500c07b62759eea7096eefd73737
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 17 11:22:41 2009 +0100

    Fix a valgrind error
    
    Found in "make test" -- if we can't connect at all, "cli" is uninitialized
    (cherry picked from commit 8ffe7b07df753568d960155c27d57de2bd99993f)

commit 32737f1d62c74fd1d27b9199144ff908b42387e8
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Mar 16 13:17:04 2009 +0100

    Fix #6130: Don't crash in winbindd_rpc lookup_groupmem() on unmapped members
    
    Thanks to François Legal <devel at thom.fr.eu.org> for reporting this bug
    (cherry picked from commit e6a23d498bfd4bbe19cecf24ba3f94af83c9bf8b)

commit 1a9b79625d708920725039bd9a2c2890d49c81aa
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Mar 15 11:58:07 2009 +0100

    Fix a malloc/talloc mismatch when cli_initialise() fails
    (cherry picked from commit 20d378eebfcaca53f456f0fbae39d46031729de7)

commit 4397e68633c680c7717b59f718b237aa067620e1
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Feb 14 13:18:28 2009 +0100

    Don't log NDR_PRINT_DEBUG at level 0, this always ends up in syslog
    
    I think we eventually need to pass down the debuglevel here.
    (cherry picked from commit b2f6110d3ac5d60054a7e5a1d365f0a1f67a2f42)

commit 86885d659440706005c6166e848cedadb6959c9f
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 10 16:08:38 2009 +0100

    Revert "Revert "Fix a valgrind error / segfault in dns_register_smbd()""
    
    This reverts commit 96c57d26ed790b3e94c935cc4faf5661ea43a80c.
    (cherry picked from commit 045933cf5bf27fbb704e446cf8686f2f761a1ced)

commit 785e107e95dd2c28ad83026e42bfe7bc44fc2bd4
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 10 15:46:16 2009 +0100

    Revert "Fix a valgrind error / segfault in dns_register_smbd()"
    
    This reverts commit e47d2091136c4d870bb91b8a84eb9f6fd78eb971.
    
    No idea why, but this causes timeouts in the build farm all over the place
    (cherry picked from commit 0cf74151286238890ae0da0863e3a5807f4f3d81)

commit f8bf0cc7337af0993d105ab7a0aac8c807814cf5
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Mar 10 14:06:05 2009 +0100

    Fix a valgrind error / segfault in dns_register_smbd()
    (cherry picked from commit 4624451b7b78695b3f84e7fff91018ee9df0e589)
    (cherry picked from commit e47d2091136c4d870bb91b8a84eb9f6fd78eb971)

commit 98da25cee03d5aa095e5d283f7d5068543c3c66f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 9 12:35:21 2009 +0100

    s3:lib: interfaces.c isn't used in the configure tests anymore
    
    libreplace always provides the getifaddr() function.
    
    This fixes the build on sles8.
    
    metze
    (cherry picked from commit 1410490fe769bc79f98b4ab364685c7aed253e09)
    (cherry picked from commit bac96af2053996f28894458fce87e84c5c2356ff)
    (cherry picked from commit 8c50d89743a8e9024d238c6613ceea35cf160aa0)

commit 24e68bbacc3499558eda9e40d921640014fc0e43
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 5 21:46:38 2009 -0800

    Get the sense of the integer wrap test the right way around. Sorry.
    Jeremy.
    (cherry picked from commit b4d9e92dfaa84b1361cdd6e49ad88e252c8fed4d)

commit cb46dd0597bc05b7d54a55458428c35c469f1b5c
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 5 21:02:22 2009 -0800

    Now we're allowing a lower bound for auth_len, ensure we
    also check for an upper one (integer wrap).
    Jeremy.
    (cherry picked from commit f58a6c9e08b2b44399e0333b1358522aec70bbee)

commit 71473172f09d05fdd2516d9dbb9dddf7d52c5381
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 5 17:16:54 2009 -0800

    Fix bug #6161 - smbclient corrupts source path in tar mode
    This was my fault. I broke the smbclient tar argument processing
    in creating the string for chdir when removing pstrings.
    Jeremy.
    (cherry picked from commit 750f9d94b0a1208d45cc117df68042e1d83044bf)

commit e2fd37cbe001e71e6ea0ee590583036fb0e8af25
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 5 15:12:55 2009 -0800

    Complete the fix for bug 6100
    
    According to [MS-RPCE].pdf, section 2.2.2.11:
    
    ----
    A client or a server that (during composing of a PDU) has allocated more space
    for the authentication token than the security provider fills in SHOULD fill in
    the rest of the allocated space with zero octets. These zero octets are still
    considered to belong to the authentication token part of the PDU.<36>
    ----
    
    RPC implementations are allowed to send padding bytes at the end of an auth
    footer. Windows 7 makes use of this.
    
    Thanks to Nick Meier <nmeier at microsoft.com>
    
    Volker
    (cherry picked from commit 91e2cd86e24cead352f07cc1a6b4a8e3a364adb5)

commit a17136b7cc4ecfbeae1779572403abd13cfd0f14
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Mar 4 14:00:03 2009 +0100

    Fix an uninitialized variable warning
    (cherry picked from commit 43ea27319933f3b49b61decde8321d9162cfd9ef)

commit 3a08af8e78f4822ea6a08b53f6129e464c66dfab
Author: Karolin Seeger <kseeger at samba.org>
Date:   Fri Feb 27 11:09:59 2009 +0100

    s3/docs: Add missing full stop.
    
    Karolin
    (cherry picked from commit 2ab9d365cfceb28c1280566b6fe8ec3767e18149)
    (cherry picked from commit aff67e24f3675ace3c69c210aa387bc008f1cbbc)
    (cherry picked from commit 0a9aff0bca4c49de0f87e496f62053787777f61d)

commit 60fd978cf999a5eddacf49e5366c551999864e50
Author: Bo Yang <boyang at novell.com>
Date:   Fri Feb 27 11:37:19 2009 -0800

    Initialize the id_map status in idmap_ldap to avoid surprise
    (cherry picked from commit c23dffc930cb9852bb98c2a92f0215cf73f4572d)

commit 666dabc0161b4fb5c872b4fbc1229a27533b6af0
Author: Steven Danneman <steven.danneman at isilon.com>
Date:   Fri Feb 27 08:35:18 2009 -0800

    s3: fix guest auth when winbindd is running
    
    This fix is very subtle.  If a server is configured with "security = share"
    and "guest ok = yes" and winbindd is running authorization will fail during
    tree connect.
    
    This is due to our inability to map the guest sid S-1-5-21-X-501 to a uid
    through sid_to_uid().  Winbindd is unaware of the hard coded mapping
    between this sid and whatever uid the name in lp_guestaccount() is assigned.
    So sid_to_uid() fails and we exit create_token_from_username() without
    ever calling pdb_getsampwsid() which IS aware of the hard coded mapping.
    
    This patch just reorganizes the code, moving sid_to_uid() down to the
    block of code in which it is needed, avoiding this early failure.
    (cherry picked from commit 671812696217fe1337562b661d5131be79797f1c)

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

Summary of changes:
 WHATSNEW.txt                                      |  247 ++++++++++----------
 docs-xml/smbdotconf/security/clientlanmanauth.xml |    2 +-
 source/Makefile.in                                |   10 +-
 source/VERSION                                    |    4 +-
 source/auth/auth_util.c                           |   15 +-
 source/client/clitar.c                            |   16 ++
 source/include/dbwrap.h                           |    2 +
 source/lib/dbwrap.c                               |   27 +++
 source/lib/interfaces.c                           |   74 +------
 source/lib/netapi/user.c                          |   18 +-
 source/libads/kerberos.c                          |   12 +-
 source/libads/krb5_errs.c                         |    8 +-
 source/librpc/ndr/ndr.c                           |    4 +-
 source/libsmb/clidfs.c                            |   14 +-
 source/libsmb/clientgen.c                         |    2 +-
 source/libsmb/clikrb5.c                           |   30 ++-
 source/libsmb/clitrans.c                          |   30 +--
 source/libsmb/dsgetdcname.c                       |    2 +-
 source/libsmb/libsmb_dir.c                        |    8 +-
 source/libsmb/libsmb_file.c                       |    7 +
 source/libsmb/libsmb_stat.c                       |    1 +
 source/libsmb/smb_seal.c                          |    3 +-
 source/libsmb/unexpected.c                        |    4 +
 source/locking/locking.c                          |    3 +-
 source/modules/vfs_streams_depot.c                |    4 +-
 source/nmbd/nmbd_elections.c                      |    3 -
 source/passdb/lookup_sid.c                        |    2 +-
 source/passdb/pdb_tdb.c                           |  258 +++++++++++++++++++--
 source/rpc_server/srv_lsa_nt.c                    |    4 +
 source/rpc_server/srv_pipe.c                      |    6 +-
 source/smbd/dnsregister.c                         |    3 +-
 source/smbd/dosmode.c                             |   12 +-
 source/smbd/process.c                             |    2 +-
 source/smbd/reply.c                               |    9 +-
 source/utils/net_rpc_samsync.c                    |    3 -
 source/winbindd/idmap_ldap.c                      |    8 +
 source/winbindd/winbindd_cm.c                     |    2 +-
 source/winbindd/winbindd_pam.c                    |    2 +-
 source/winbindd/winbindd_rpc.c                    |   15 +-
 39 files changed, 557 insertions(+), 319 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 47fd5b0..d2c7893 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,17 +1,18 @@
                    =============================
-                   Release Notes for Samba 3.2.8
-			  March 03, 2009
+                   Release Notes for Samba 3.2.9
+			  March 31, 2009
                    =============================
 
 
-This is a bug fix release of the Samba 3.2 series.
+This is a maintenance release of the Samba 3.2 series.
 
-Major enhancements included in Samba 3.2.8 are:
+Major enhancements included in Samba 3.2.9 are:
 
-  o Correctly detect if the current DC is the closest one.
-  o Add saf_join_store() function to memorize the DC used at join time.
-    This avoids problems caused by replication delays shortly after domain
-    joins.
+  o Migrating from 3.0.x to 3.3.x can fail to update passdb.tdb
+    correctly (bug #6195).
+  o Fix guest authentication in setups with "security = share" and
+    "guest ok = yes" when Winbind is running.
+  o Fix corruptions of source path in tar mode of smbclient (bug #6161).
 
 
 The original security announcement for this and past advisories can
@@ -22,166 +23,160 @@ be found http://www.samba.org/samba/security/
 Changes
 #######
 
-Changes since 3.2.7
+Changes since 3.2.8
 -------------------
 
 
 o   Michael Adam <obnox at samba.org>
-    * BUG 6066: netinet/ip.h present but cannot be compiled under Solaris.
-    * Fix join by creating keytab after changing the config in libnet.
-    * Streamline logic of libnet_join_post_processing() in libnet_join.
-    * Fix build of [u]mount.cifs in the RHEL packaging.
-    * Fix distclean target and add realdistclean target in the docs build.
-    * Clean generated .png images and build/catalog.xml in "make clean".
-    * Fix detection of netinet/ip.h on Solaris 8.
+    * Add script fill-templates.
+    * Make update-pkginfo callable from any directory.
 
 
 o   Jeremy Allison <jra at samba.org>
-    * BUG 4308: Excel save operation corrupts file ACLs.
-    * BUG 5979: Fix level 2 oplocks.
-    * BUG 5980: Fix race condition when granting level2 oplocks can cause break
-      notify to be missed.
-    * BUG 5986: Fix renaming of streams.
-    * BUG 5990: Strict allocate should be checked before ftruncate.
-    * BUG 6009: Setting "min receivefile size = 1" breaks writes.
-    * BUG 6016: Alternate Data Streams / Extended Attributes seem to conflict.
-    * BUG 6017: Fix magic scripts.
-    * BUG 6019: Fix file corruption in Clustered SMB/NFS environments managed via
-      CTDB.
-    * BUG 6021: smbclient du command does not recuse properly.
-    * BUG 6030: Add missing <th> header in Status page.
-    * BUG 6035: Fix possible race between fcntl F_SETLKW and alarm delivery.
-    * BUG 6040: Calling Samba print server with an aliased DNS-name fails.
-    * Fix race condition in alarm lock processing.
-    * Fix logic bug introduce in backport of ccache_regain_all_now.
-    * Fix crash bug in SWAT.
-    * Fix logic error in try_chown.
-    * Fix detection of dns_sd libraries.
+    * BUG 6099: Samba returns incurrate capabilities list.
+    * BUG 6133: Cannot delete non-ACL files on Solaris/ZFS/NFSv4 ACL
+      filesystem.
+    * BUG 6161: smbclient corrupts source path in tar mode.
+    * BUG 6195: Migrating from 3.0.x to 3.3.x can fail to update passdb.tdb
+      correctly.
+    * BUG 6196: Unable to serve files with colons to Linux CIFS/VFS client.
+    * BUG 6224: nmbd waits 5 minutes at startup before checking if it needs to
+      run elections.
+    * Correctly use chroot().
+    * Parameterize in local.h the MAX_RPC_DATA_SIZE, and ensure
+      that "offered" read from the rpc packet in spoolss is under
+      that size.
+    * Fix Coverity ID 602.
+    * Backport the semantics of when to delete alternate data streams on a file
+      truncate.
+    * Allow set attributes on a stream fnum to be redirected to the base
+      filename.
+    * Fix use of streams modules with CIFSFS client.
+    * Fix more POSIX path lstat calls.
+    * Allow DFS client paths to work when POSIX pathnames have been
+      selected.
+    * Try and fix the build farm RAW-STREAMS errors.
+    * Ensure files starting with multiple dots are hidden.
+
+
+o   Steven Danneman <steven.danneman at isilon.com>
+    * Fix guest auth when Winbind is running.
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 6102: NetQueryDisplayInformation could return wrong information.
+    * BUG 6193: Avoid messing with sync_context in fetch_database_to_ldif().
+    * Fix memleak in get_remote_printer_publishing_data().
+    * Add pidl in order to be able to regenerate librpc functions.
+    * Fix Coverity IDs 722, 762.
+
+
+o   Steve French <smfrench at gmail.com>
+    * cifs mount fix for handling -V parameter.
+    * Fix guest mounts.
+
+
+o   Holger Hetterich <hhetter at novell.com>
+    * Enable total anonymization in vfs_smb_traffic_analyzer.
 
 
-o   Kai Blin <kai at samba.org>
-    * BUG 5953: Fix smbclient crashes.
+o   Björn Jacke <bj at sernet.de>
+    * Enable IPv6 support for NetBSD and FreeBSD.
+    * Prefer gssapi header files from subdirectory.
+    * Fix build on old Heimdal based systems.
+    * Use parentheses in if condition to make negation clear.
 
 
-o   Gerald (Jerry) Carter <jerry at samba.org>
-    * Fix "allow trusted domain" so it disables trusted domains.
+o   Günter Kukkukk <linux at kukkukk.com>
+    * Don't try and delete a default ACL from a file.
 
 
-o   Guenther Deschner <gd at samba.org>
-    * Fix buffer allocation in eventlog read call.
-    * Fix various invalid memcpy in read_package_entry().
+o   Jeff Layton <jlayton at redhat.com>
+    * Initialize rc to 0 in main.
 
 
-o   SATOH Fumiyasu <fumiyas at osstech.co.jp>
-    * Variables for signals must be volatile sig_atomic_t in Winbind.
-    * Fix gmem->numgids and gmem->maxgids breakage on Solaris 64-bit.
-    * Fix a compile-time warning.
-    * Fix SIGBUS on non-x86 CPUs in libsmbclient.
+o   Volker Lendecke <vl at sernet.de>
+    * BUG 6100: Complete fix.
+    * BUG 6130: Don't crash in winbindd_rpc lookup_groupmem() on unmapped
+      members.
+    * BUG 6097: Fix smbd segfault.
+    * Fix remotely adding a share via MMC.
+    * Fix resume handle for _samr_EnumDomainGroups.
+    * Fix Coverity IDs 742, 744, 745, 879, 880.
+    * Fix a buffer handling bug when adding lots of registry keys.
+    * Fix a O(n^2) algorithm in regdb_fetch_keys().
+    * Fix an uninitialized variable warning.
+    * Fix a valgrind error / segfault in dns_register_smbd().
+    * Don't log NDR_PRINT_DEBUG at level 0, this always ends up in syslog.
+    * Fix a malloc/talloc mismatch when cli_initialise() fails.
+    * Fix a valgrind error.
+    * Fix two memleaks in the encryption code.
+    * Fix gcc 4.4 compile warning.
+    * Fix a scary "fill_share_mode_lock failed" message.
 
 
-o   Björn Jacke <bj at sernet.de>
-    * Correct the description of the "ldap timeout" parameter.
-    * Fix build with external dns_sd libraries.
+o   Derrell Lipman <derrell at dworkin.(none)>
+    * BUG 6228: Fix SMBC_open_ctx failure due to path resolve failure doesn't
+      set errno.
 
 
-o   Jeff Layton <jlayton at redhat.com>
-    * Allow mounts to ipv6 capable servers in mount.cifs.
+o   Stefan Metzmacher <metze at samba.org
+    * BUG 6100: Implement _netr_LogonGetCapabilities() with
+      NT_STATUS_NOT_IMPLEMENTED.
+    * Add S-1-22-X-Y sids to the local token.
+    * Add idl for netr_LogonGetCapabilities().
+    * Fix the build on SLES8.
+    * Fix smb signing for fragmented trans/trans2/nttrans requests.
 
 
-o   Volker Lendecke <vl at sernet.de>
-    * BUG 5933: Fix incrementing/decrementing num_validated_vuids.
-    * BUG 5953: Make cli_send_smb_direct_writeX use writev.
-    * BUG 5965: Fix creation of the first share using SWAT.
-    * BUG 5969: Optimize smbclient put command.
-    * BUG 6014: mget shouldn't segfault without arguments.
-    * Fix error code when smbclient puts a file over an existing directory.
-    * Fix a valgrind error.
-    * Fix a "ignoring function call result" warning.
-    * Add sys_writev.
-    * Add write_data_iov.
-    * Make write_data use write_data_iov.
-    * Fix a memory leak in cups_pull_comment_location.
-    * Fix an ancient uninitialized variable read.
-    * Fix a bad memleak in vfs_full_audit.
-    * Fix several valgrind errors.
-    * Fix 'net rpc join' for users with the SeMachineAccountPrivilege.
+o   Glenn Machin <gmachin at sandia.gov>
+    * Don't miss an absolute pathname as a kerberos keytab path.
 
 
-o   Herb Lewis <hlewis at chomps.localdomain>
-    * Don't return 0 on error in smbcacls - bad for scripts.
+o   Shirish Pargaonkar <shirishpargaonkar at gmail.com>
+    * Clean-up entries in /etc/mtab after unmount.
+    * Add fakemount (-f) and nomtab (-n) flags to mount.cifs.
 
 
-o   Derrell Lipman <derrell.lipman at unwireduniverse.com>
-    * Determine case sensitivity based on file system attributes in
-      libsmbclient.
+o   Ted Percival <ted.percival at quest.com>
+    * Fix a crash during name resolution when log level >= 10 and libc
+      segfaults if printf is passed NULL for a "%s" arg (e.g. Solaris).
 
 
-o   Stefan Metzmacher <metze at samba.org>
-    * Correctly detect if the current dc is the closest one.
-    * Use get_dc_name() instead of get_sorted_dc_list() in the LDAP case.
-    * Fallback to returning all DCs, when none is available in the requested
-      site.
-    * Add saf_join_store() function.
-    * Use DS_FORCE_REDISCOVERY in libnet_join.
-    * Use dbwrap to open sessionid.tdb in net status.
-    * Fix dbwrap_store_uint32() to match dbwrap_store_int32().
-    * Handle the SMB signing states the same in the krb5 and ntlmssp cases in
-      libsmb.
-    * Re-add "fileid:algorithm" as option in vfs_fileid.
-    * Add vfs_fileid manpage.
+o   Tim Prouty <tprouty at samba.org>
+    * Fix SMB_VFS_RECVFILE/SENDFILE macros.
+    * Parse_packet can return NULL which is then dereferenced in
+      match_mailslot_name.
 
 
-o   Lars Müller <lars at samba.org>
-    * Tweak with pam defines of older Linux versions.
-    * Adjust regex to match variable names including underscores.
-    * Conditional install of the cifs.upcall man page.
+o   Dan Sledz <dsledz at isilon.com>
+    * Fix double free caused by incorrect talloc_steal usage.
 
 
-o   Tim Prouty <tprouty at samba.org>
-    * Fix stream marshalling to return the correct streaminfo status.
-    * Fix a delete on close divergence from Windows.
-    * Allow renames of streams via NTRENAME and fix stream error codes on
-      rename.
-    * Remove a few unnecessary checks from the streams depot module and fix to
-      work with NTRENAME.
-    * Remove a few unnecessary checks from the streams xattr module.
-    * Remove a few unnecessary checks from the streams xattr module.
+o   Aravind Srinivasan <aravind.srinivasan at isilon.com>
+    * Have nmbd check all available interfaces for WINS before failing.
 
 
-o   Andreas Schneider <anschneider at suse.de>
-    * Fix a segfault if ? is there but the options are NULL.
-    * Avoid flooding of syslog with failing pam_putenv messages.
-    * Document default of the printing config variable.
-    * Use talloc_tos() instead of the talloc NULL context.
+o   Miguel Suarez <Miguel.Suarez at stratus.com>
+    * BUG 6085: Fix build of vfs_default on systems without utime support.
 
 
-o   Karolin Seeger <kseeger at samba.org>
-    * BUG 6058: Use 'make distclean' instead of 'make clean' in build_docs.
-    * BUG 6000: Avoid bashism in perfcount.init.
-    * Change default value for "ldap ssl" to "start tls".
-    * Several documentation improvements/typo fixes.
-    * Fix syntax error in samba.spec.tmpl.
-    * Check if Unix account exists before asking for the password in smbpasswd.
-    * Add manpage for vfs_shadow_copy2.
+o   Yasuma Takeda <yasuma at osstech.co.jp>
+    * BUG 5920: The length of the memcpy was calculated wrong.
+    * BUG 6098: Fix the ads_find_dc() with "security = domain" when the DNS
+      server is invalid.
 
 
-o   Richard Sharpe <realrichardsharpe at gmail.com>
-    * Fix mistake in DEBUG message.
+o   Andrew Tridgell <tridge at samba.org>
+    * Fix a bug in message handling for code the change notify code.
 
 
-o   Andrew Tridgell <tridge at samba.org>
-    * Keep compatibility with v3-0-ctdb name for fileid:mapping option.
+o   Jelmer Vernooij <jelmer at samba.org>
+    * Properly cast array length in print functions.
 
 
 o   Bo Yang <boyang at novell.com>
-    * Clean event context after child is forked.
-    * Refresh sequence number as soon as possible.
-    * Don't set child->requests to NULL in parent after fork.
-    * Backport of the clean event context after fork and
-      krb5 refresh chain fixes.
-    * Fix null pointer refrence in event context.
-    * Don't send message to any other child in child process.
-    * Fix bug in get_dc_name_via_netlogon(), null pointer refrence.
+    * Initialize the id_map status in idmap_ldap to avoid surprise.
 
 
 ######################################################################
diff --git a/docs-xml/smbdotconf/security/clientlanmanauth.xml b/docs-xml/smbdotconf/security/clientlanmanauth.xml
index 967eacf..9c61ded 100644
--- a/docs-xml/smbdotconf/security/clientlanmanauth.xml
+++ b/docs-xml/smbdotconf/security/clientlanmanauth.xml
@@ -17,7 +17,7 @@
     this option.  </para>
 
     <para>Disabling this option will also disable the <command
-    moreinfo="none">client plaintext auth</command> option</para>
+    moreinfo="none">client plaintext auth</command> option.</para>
 
     <para>Likewise, if the <command moreinfo="none">client ntlmv2
     auth</command> parameter is enabled, then only NTLMv2 logins will be
diff --git a/source/Makefile.in b/source/Makefile.in
index 29a41a9..ce5a052 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -546,7 +546,7 @@ PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
 		passdb/util_unixsids.o passdb/lookup_sid.o \
 		passdb/login_cache.o @PDB_STATIC@ \
 		lib/account_pol.o $(PRIVILEGES_OBJ) \
-		lib/util_nscd.o lib/winbind_util.o
+		lib/util_nscd.o lib/winbind_util.o $(SERVER_MUTEX_OBJ)
 
 DEVEL_HELP_WEIRD_OBJ = modules/weird.o
 CP850_OBJ = modules/CP850.o
@@ -640,7 +640,7 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o smbd/connection.o \
 	       smbd/dosmode.o smbd/filename.o smbd/open.o smbd/close.o \
 	       smbd/blocking.o smbd/sec_ctx.o smbd/srvstr.o \
 	       smbd/vfs.o smbd/statcache.o smbd/seal.o \
-               smbd/posix_acls.o lib/sysacls.o $(SERVER_MUTEX_OBJ) \
+               smbd/posix_acls.o lib/sysacls.o \
 	       smbd/process.o smbd/service.o smbd/error.o \
 	       printing/printfsp.o lib/sysquotas.o lib/sysquotas_linux.o \
 	       lib/sysquotas_xfs.o lib/sysquotas_4A.o \
@@ -842,7 +842,7 @@ NET_OBJ = $(NET_OBJ1) \
 	  $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
 	  $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
 	  $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
-	  $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
+	  $(SMBLDAP_OBJ) $(DCUTIL_OBJ) \
 	  $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(READLINE_OBJ) \
 	  $(LDB_OBJ) $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) \
 	  $(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \
@@ -1012,7 +1012,7 @@ WINBINDD_OBJ = \
 		$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
 		$(DCUTIL_OBJ) $(IDMAP_OBJ) $(NSS_INFO_OBJ) \
 		$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
-		$(LIBADS_SERVER_OBJ) $(SERVER_MUTEX_OBJ) $(LDB_OBJ) 
+		$(LIBADS_SERVER_OBJ) $(LDB_OBJ) 
 
 WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 		$(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
@@ -1077,7 +1077,7 @@ NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o
 
 NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
 		libsmb/asn1.o libsmb/spnego.o libsmb/clikrb5.o libads/kerberos.o \
-		$(SERVER_MUTEX_OBJ) $(LIBADS_SERVER_OBJ) \
+		$(LIBADS_SERVER_OBJ) \
 		$(PASSDB_OBJ) $(GROUPDB_OBJ) \
 		$(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
 		$(LDB_OBJ) $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
diff --git a/source/VERSION b/source/VERSION
index ecacdba..b6f32b1 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=2
-SAMBA_VERSION_RELEASE=8
+SAMBA_VERSION_RELEASE=9
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #
@@ -96,4 +96,4 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
 #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
 ########################################################
 SAMBA_VERSION_VENDOR_SUFFIX="ctdb"
-SAMBA_VERSION_VENDOR_PATCH=57
+SAMBA_VERSION_VENDOR_PATCH=58
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 5789beb..4819057 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -737,7 +737,6 @@ NTSTATUS create_local_token(auth_serversupplied_info *server_info)
 	}
 
 	if (!NT_STATUS_IS_OK(status)) {
-		TALLOC_FREE(mem_ctx);
 		return status;
 	}
 	
@@ -798,7 +797,7 @@ NTSTATUS create_local_token(auth_serversupplied_info *server_info)
 }
 
 /*
- * Create an artificial NT token given just a username. (Initially indended
+ * Create an artificial NT token given just a username. (Initially intended
  * for force user)
  *
  * We go through lookup_name() to avoid problems we had with 'winbind use
@@ -851,12 +850,6 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 		goto done;
 	}
 
-	if (!sid_to_uid(&user_sid, uid)) {
-		DEBUG(1, ("sid_to_uid for %s (%s) failed\n",
-			  username, sid_string_dbg(&user_sid)));
-		goto done;
-	}
-
 	if (sid_check_is_in_our_domain(&user_sid)) {
 		bool ret;
 
@@ -914,6 +907,12 @@ NTSTATUS create_token_from_username(TALLOC_CTX *mem_ctx, const char *username,
 
 	unix_user:
 
+		if (!sid_to_uid(&user_sid, uid)) {
+			DEBUG(1, ("sid_to_uid for %s (%s) failed\n",
+				  username, sid_string_dbg(&user_sid)));
+			goto done;
+		}
+
 		uid_to_unix_users_sid(*uid, &user_sid);
 
 		pass = getpwuid_alloc(tmp_ctx, *uid);
diff --git a/source/client/clitar.c b/source/client/clitar.c
index 084f87e..be0bc32 100644
--- a/source/client/clitar.c
+++ b/source/client/clitar.c
@@ -1506,6 +1506,7 @@ int process_tar(void)
 
 					if (strrchr_m(cliplist[i], '\\')) {
 						char *p;
+						char saved_char;
 						char *saved_dir = talloc_strdup(ctx,
 									client_get_cur_dir());
 						if (!saved_dir) {
@@ -1524,13 +1525,28 @@ int process_tar(void)
 						if (!tarmac) {
 							return 1;
 						}
+						/*
+						 * Strip off the last \\xxx
+						 * xxx element of tarmac to set
+						 * it as current directory.
+						 */
 						p = strrchr_m(tarmac, '\\');
 						if (!p) {
 							return 1;
 						}
+						saved_char = p[1];
 						p[1] = '\0';
+
 						client_set_cur_dir(tarmac);
 
+						/*
+						 * Restore the character we
+						 * just replaced to
+						 * put the pathname
+						 * back as it was.
+						 */
+						p[1] = saved_char;
+
 						DEBUG(5, ("process_tar, do_list with tarmac: %s\n", tarmac));
 						do_list(tarmac,attribute,do_tar, False, True);
 
diff --git a/source/include/dbwrap.h b/source/include/dbwrap.h
index cf71450..40ff596 100644
--- a/source/include/dbwrap.h
+++ b/source/include/dbwrap.h
@@ -54,6 +54,8 @@ struct db_context {
 	bool persistent;
 };
 
+bool db_is_local(const char *name);
+
 struct db_context *db_open(TALLOC_CTX *mem_ctx,
 			   const char *name,
 			   int hash_size, int tdb_flags,
diff --git a/source/lib/dbwrap.c b/source/lib/dbwrap.c
index 055f554..126b5c1 100644
--- a/source/lib/dbwrap.c
+++ b/source/lib/dbwrap.c
@@ -65,6 +65,33 @@ static int dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key,
 	return res;
 }
 


-- 
SAMBA-CTDB repository


More information about the samba-cvs mailing list