[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0rc2-73-g2f861c7

Karolin Seeger kseeger at samba.org
Fri Jan 2 12:09:05 GMT 2009


The branch, v3-3-stable has been updated
       via  2f861c731dc969415fef47b060bb783547435ce4 (commit)
       via  6707c64fc22abb9ac7d93c7446e4ef842b861396 (commit)
       via  9269a90a45bae8777d8e8ca257fa101b4086bc23 (commit)
       via  fdb9ae59e291ef20a983f41a8aa8a53a8b8b1465 (commit)
       via  e767df6d2836697e3480850be99a59699cc27255 (commit)
       via  acc3a7eba329a15ac80769dac1853eed6a7c38f7 (commit)
       via  14dc9c4c6c6b5ac8c8a9ee57c37f58964393669e (commit)
       via  076e0b01f99f147a3b30233bf50986157b84c979 (commit)
       via  15a7d01c0983bbc37ce9038848f80665f2ac8bfc (commit)
       via  1e7febce09bfe01c919068c5bf21d0f886525c6a (commit)
       via  345d14d5994f4d16793cd661e06cd181fba5a292 (commit)
       via  728a4fa62f058eca24f1be8d26d6d968afcced13 (commit)
       via  04708dd52fdd27071756d58851d541c05f27e9c2 (commit)
       via  01b65cb84beec9278e1ee6fd1fd20541adf54e3d (commit)
       via  7125c95bf1f7a822f2873938bcdde4be5acdd59c (commit)
       via  d64d9d6205d68951b9efec959194c12ce204961c (commit)
       via  897e0ee57ed913206eb705ed56fb691aa488bb9a (commit)
       via  2e540d693ddf706b7927964104a3e01e8d944c35 (commit)
       via  41b3c91c787b16f6315e35283dababfbb19fd39b (commit)
       via  f1fcb808a56943b7332f888f5cc9cc357c5be66a (commit)
       via  5c7f4b26bc038ad949c81f77a57cc709b4d144f7 (commit)
       via  3713aa0f7ab7109f4bbdad59b8a547c7f254617d (commit)
       via  ee03d50f5b40d6d50c99acac0cba62c7faa2f42a (commit)
       via  a443c09ee81416394592bafbba40620705166da6 (commit)
       via  85e721c1fb8a1a5f0b49ccf0f7c6865f6eb4fe5b (commit)
       via  cb4196effb812022c6c1a038ae9090edf51fd57a (commit)
       via  40e57e35b21e37a88c2485d72f4323cc0a71e663 (commit)
       via  cc9f416f481a7a222d34b7502e16c0360cefaf7a (commit)
       via  54458d8a41a61989891dc3963a19adb49507f190 (commit)
       via  bfaec4b40353d91a92ffd0d6939b1a5d4df72a0e (commit)
       via  6ddb477052eb50ad1154468c71e6fe804b3127e0 (commit)
       via  b8454188f9ae1b7ce5bb2a06b556fb8098dc5c70 (commit)
       via  3062b231c636cbdad8b83f7f340d9fccbb9382d5 (commit)
       via  31c1e2433a55317bfa8b6d73e66374db2d612612 (commit)
       via  fe13b229aa6d3e271f633ba64e05f72d63031a1d (commit)
       via  c559640ba282928eca4cafa65a1f1f5d4d463f65 (commit)
       via  3000c845ec67577937bc620dc7afd0ddc4ae0de5 (commit)
       via  88806e9fcc5c721a6763db9ed41e4b8feab15cc0 (commit)
       via  ba0ebf649ae8981e4dd023d4afcd04a34fb3e87b (commit)
       via  b229fa21a185510e1a3689292f363516ba947b39 (commit)
       via  881a3e7211c077236253e9748b9ac2dc060a4941 (commit)
       via  3c2a4842ae8a0d90f131330e35e830a16283cd65 (commit)
       via  a008189a10a8b9c4c56cca4ceb300f52fa9bdc23 (commit)
       via  f312f7e7e076f864d836ff3f8fee8d8183073fac (commit)
       via  30885c46c7898ebd79e5b35ee251f34e3ef302b0 (commit)
       via  7239afc90af8bcc512b68b9730cbbf611313c450 (commit)
       via  934b2cb5664daa7324a0c95f6e78743c6d67fc7b (commit)
       via  0a802a12440d269dcc6a33d8c9f1b47e86c0730a (commit)
       via  ae5e1927fa1574d248ee029a8a6b18bb4497c861 (commit)
       via  d6692b8bdb67d9af851205d6495d0e65fa617c87 (commit)
       via  c99ddf7ae0363ea33f9fe682ebae23ff8210349f (commit)
       via  5fbfeb0fea3590fa6e018249527ba6994e36c882 (commit)
       via  a2ee630e29153074994bbdf3e350d72afe92e187 (commit)
       via  01428634e39a764b803b4ba7157d79f6e53c5fa9 (commit)
       via  63fc23c24e447b5583ebb96d606fc4065ce5ff28 (commit)
       via  ef7d2e634bba6cd0dfe339f4eef55edea7fc75ca (commit)
       via  c44dcaf9b8cc36a6cb031cbc6fd6ce0ef1776118 (commit)
       via  b9068d70bcc563be6df84fc7b9745c12f367741c (commit)
       via  037a1ca4477c3ed09a9f3c39f7190f6f7ecf88ce (commit)
       via  6e016ecc7a42ff87a1d4edc7a1f58e8e8fc65211 (commit)
       via  88ce69796bb46c11d7d2747fe2cf43d0f79caa15 (commit)
       via  d16fd4150d573d2aca4ec8c1cd2c36f7a1f2a55f (commit)
       via  bcb07054c88f484753dd50d25359c46ea8225287 (commit)
       via  77259611c26145cf179fa706b863fdc13b16c264 (commit)
       via  95afbc350b0a93af5e9c660f7f4dc08f13129295 (commit)
       via  055de84f3e3b2aea181c97539d7a11b19c5aea31 (commit)
       via  a1dcf735da8128ca28ec325bb7a0596b61d213e9 (commit)
       via  4bf2adeb5e8769141ad74d445bead5cb8e59706c (commit)
       via  5533cf6234be930b2565f9036537405bf37a0916 (commit)
       via  08a28e7de190c281237dae48711870612c6b59eb (commit)
       via  0fef3e1279e42446a9d60a142bc031e234cfec4e (commit)
       via  3c6f3bb6998f821f253a0c53bb2b7157475bf073 (commit)
       via  1ae75d7a3dc0ebff7f4112a2f398f2e171bd0443 (commit)
      from  6dc46a003865d7f59a32de2c470ad3c21f8ae86c (commit)

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


- Log -----------------------------------------------------------------
commit 2f861c731dc969415fef47b060bb783547435ce4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jan 2 09:46:17 2009 +0100

    Happy New Year!
    
    metze
    (cherry picked from commit e385b4175d9accc6b78f0f506d1c1f696a1dcad1)

commit 6707c64fc22abb9ac7d93c7446e4ef842b861396
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jan 1 22:05:03 2009 +0100

    Fix bug 5913.
    
    Never seen this to be a problem, but it doesn't hurt either :-)
    (cherry picked from commit 8f2d5137852fd3f2a376a7fa71f1a5c8b947bd37)

commit 9269a90a45bae8777d8e8ca257fa101b4086bc23
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 31 19:06:00 2008 -0800

    Fix warnings in make test code.
    Jeremy.
    (cherry picked from commit 675c4d836ec328320994bc1632a14ac5597bbdf8)

commit fdb9ae59e291ef20a983f41a8aa8a53a8b8b1465
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 31 17:27:52 2008 -0800

    Fix all warnings with gcc4.3.
    Jeremy.
    (cherry picked from commit 0994b094569474d47e7b98e39438829e962a27e1)

commit e767df6d2836697e3480850be99a59699cc27255
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 31 16:16:52 2008 -0800

    Fix more asprintf and "ignoring return code" warnings from gcc 4.3.
    Jeremy.
    (cherry picked from commit cfee202547a536a54284a14732df2e48eef99952)

commit acc3a7eba329a15ac80769dac1853eed6a7c38f7
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Dec 31 18:37:39 2008 +0100

    recvfile can't be used for printing so far
    (cherry picked from commit 3367acd7fac7758ef5eb027bcd8bcbfbb3f3c0fd)

commit 14dc9c4c6c6b5ac8c8a9ee57c37f58964393669e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 29 16:31:57 2008 +0100

    s3:winbindd: we don't need to call messaging_reinit() twice
    
    reinit_after_fork() already calls messaging_reinit()
    
    metze
    (cherry picked from commit 429276556a4930fa1bc782904447120950073190)
    (cherry picked from commit 6bd2276d426bb92e2fc195ea69aeeb4aa7a574e7)

commit 076e0b01f99f147a3b30233bf50986157b84c979
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 30 22:24:04 2008 +0100

    Fix an ancient uninitialized variable read
    
    The callers of open_file_ntcreate expect *psbuf to be filled correctly
    (cherry picked from commit b0f293addb93e34107fcfd52170261885104dbb0)

commit 15a7d01c0983bbc37ce9038848f80665f2ac8bfc
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 30 17:52:08 2008 -0800

    Fix more "ignore return value" warnings from gcc 4.3.
    Jeremy
    (cherry picked from commit 16bc03070785009b06ee7a1bfea0c54e23bab470)

commit 1e7febce09bfe01c919068c5bf21d0f886525c6a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Dec 18 15:02:42 2008 +0100

    s3:cluster: register the client connection via CTDB_CONTROL_TCP_ADD
    
    This means we correctly pass IPv6 addresses too.
    (CTDB_CONTROL_TCP_CLIENT was IPv4 only)
    
    metze
    (cherry picked from commit 465176b7e2fc1370dded850a80a8fe8519e79db8)
    (cherry picked from commit 6d5b415c5a0d7e0b7aae2f20ee7989ca58ec2f81)

commit 345d14d5994f4d16793cd661e06cd181fba5a292
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 15 19:28:27 2008 +0100

    s3:pdb_tdb: store the next rid counter in passdb.tdb instead of winbind_idmap.tdb
    
    This upgrades the TDBSAM_VERSION to 4 and SAMU_BUFFER_V4.
    
    metze
    (cherry picked from commit 7516ba860c160e8b971b6f5bc1036370169e6e8a)
    (cherry picked from commit adc22887e50b6bb48f7235361460f61999965f84)

commit 728a4fa62f058eca24f1be8d26d6d968afcced13
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Dec 16 11:51:14 2008 +0100

    s3:passdb: add SAMU_BUFFER_V4 with no changes
    
    The upgrade is required because of the followin TDBSAM_VERSION
    upgrade.
    
    metze
    (cherry picked from commit 671469ae7e3013809fe3995ec8f33dda9adda2ed)
    (cherry picked from commit 513d7cf7dd8758045ba7666785dbada88a990ce1)

commit 04708dd52fdd27071756d58851d541c05f27e9c2
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 15 18:46:37 2008 +0100

    s3:passdb: make marshalling struct samu from and to a buffer more generic
    
    This marshalling isn't specific to tdbsam and it's
    ugly to have the related functions in two different files.
    
    metze
    (cherry picked from commit 0544734309feea44e8d449737a9934231f63693d)
    (cherry picked from commit d54fb8838a418493ebc7a559af4be95def97dfd9)

commit 01b65cb84beec9278e1ee6fd1fd20541adf54e3d
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 30 15:47:06 2008 +0100

    Fix a memory leak in cups_pull_comment_location
    
    We allocated "request" with ippNew, so we also should ippDelete it.
    (cherry picked from commit 6118aaeb2d4b164c5ed213aa2ae25ed13bfe1c22)

commit 7125c95bf1f7a822f2873938bcdde4be5acdd59c
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 30 14:05:26 2008 +0100

    Fix a spinning smbd when printing
    
    Without this, we end up adding more than one timed event. In the event handler
    print_notify_event_send_messages() only one event will be deleted, all others
    will fire indefinitely.
    (cherry picked from commit dec9368e7458048b783bb2f967f578d5e094d805)

commit d64d9d6205d68951b9efec959194c12ce204961c
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 29 23:24:43 2008 +0100

    Don't increment twice
    
    Thanks metze :-)
    (cherry picked from commit fe100673121b73cc2091726d068d9a3e53bf494e)

commit 897e0ee57ed913206eb705ed56fb691aa488bb9a
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 29 22:06:08 2008 +0100

    Second part of the bugfix for #5933
    
    Incrementing the next vuid did not correctly overflow
    
    Now we survive BENCH-SESSSETUP with -o 100000. Takes a while though :-)
    
    Thanks a lot to Ofer Tal <otsmb at shmoop.org> for reporting #5933
    (cherry picked from commit b99206414f6a90c9b2223a25f3ddf5290861363d)

commit 2e540d693ddf706b7927964104a3e01e8d944c35
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 29 22:01:57 2008 +0100

    First part of bugfix for #5933
    
    Ofer Tal <otsmb at shmoop.org> fully correctly noted that we're incrementing
    num_validated_vuids twice per session setup, but decrement it only once.
    Looking at sesssetup.c we always call register_initial_vuid() before
    register_existing_vuid(), so there's no point in incrementing it in
    register_existing_vuid().
    
    Jeremy, please check!
    (cherry picked from commit 769989008d97308d2a10675a91ae2dfdde493bab)

commit 41b3c91c787b16f6315e35283dababfbb19fd39b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Dec 17 17:16:50 2008 +0100

    s3:dbwrap: fix dbwrap_store_uint32() to match dbwrap_store_int32()
    
    All callers expect 0 an success and -1 on error.
    
    metze
    (cherry picked from commit a255f9ce713b29552722ec73e4038226959e1c8e)
    (cherry picked from commit 9aa543fee7ebcc95125d18868bdec7e4bf577d8a)

commit f1fcb808a56943b7332f888f5cc9cc357c5be66a
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 22 22:42:44 2008 +0100

    Add code to test write_data_iov a bit
    (cherry picked from commit 8c7552790934397c1bbb7e93eb64716a5fed31fa)

commit 5c7f4b26bc038ad949c81f77a57cc709b4d144f7
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 22 22:32:12 2008 +0100

    Attempt to fix bug 5953: Make cli_send_smb_direct_writeX use writev
    
    It seems there are SMB servers around which can't cope with the write header
    being sent in a packet of its own. With writev we keep the advantage of direct
    writes, giving the kernel the chance to coalesce the write calls.
    (cherry picked from commit 1cbe293e7ba16968bf0e106cb6ee723a1f31d5bb)

commit 3713aa0f7ab7109f4bbdad59b8a547c7f254617d
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 22 22:17:59 2008 +0100

    Make write_data use write_data_iov
    (cherry picked from commit f77527188bdc40a77764451c2fb7bba511a1f5a2)

commit ee03d50f5b40d6d50c99acac0cba62c7faa2f42a
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 22 22:17:28 2008 +0100

    Add write_data_iov
    (cherry picked from commit efd5aa6a75c68c6fa48eaa928e652e3cacf0e18e)

commit a443c09ee81416394592bafbba40620705166da6
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Dec 21 23:22:30 2008 +0100

    Add sys_writev
    (cherry picked from commit 886ebe3b6f7b5304ae9c185ee14a444977afac24)

commit 85e721c1fb8a1a5f0b49ccf0f7c6865f6eb4fe5b
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Aug 24 12:46:26 2008 +0200

    Fix some nonempty blank lines
    (cherry picked from commit 010c7101e59477f0d5f3bf11c17f474ec6f79cc1)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit c1e0d89d00885dd227b9cec719f2fb3fbc69aea3)

commit cb4196effb812022c6c1a038ae9090edf51fd57a
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Aug 24 12:43:36 2008 +0200

    Fix some C++ warnings
    (cherry picked from commit dd9e4e6db04acf20f6ef7705955358c7ca442bbd)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit c04b8a612c880513971ea5a03c4d0c120bfa6c4a)

commit 40e57e35b21e37a88c2485d72f4323cc0a71e663
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 25 12:12:22 2008 -0800

    Fix bug #5990 - strict allocate should be checked before ftruncate
    reported by and based on a patch by Yasuma Takeda <yasuma at osstech.co.jp>.
    Jeremy.
    (cherry picked from commit 60707022622068dd5df5c7b5aa82e0d34ed544f5)

commit cc9f416f481a7a222d34b7502e16c0360cefaf7a
Author: Michael Adam <obnox at samba.org>
Date:   Wed Oct 1 08:53:15 2008 +0200

    idmap: Remove passd check from idmap_backends_unixid_to_sid().
    
    As noted by Metzy, it makes no sense here to check id->sid.
    What is worse, this might even be passed in uninitialized.
    
    This still fixes the bug for me (of course), but we might need
    to check, if another special handling of passdb is needed
    (possibly changing from constant return code NT_STATUS_OK...)
    
    Michael
    (cherry picked from commit 651b5d6deaab4fb3cb726fafd98171c79777631c)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 3d22b77f1ac5e8f83d1063d87c68e60655a3ed6b)

commit 54458d8a41a61989891dc3963a19adb49507f190
Author: Michael Adam <obnox at samba.org>
Date:   Wed Oct 1 08:30:15 2008 +0200

    Fix uid_to_sid mapping when the idmap cache is empty.
    
    This failed for backends other than passed, since
    idmap_backends_unixid_to_sid() always asked passdb first,
    which returned Success no matter whether a mapping was
    found or not.
    
    One effect wast that getpwuid failed after "net cache flush".
    Only after filling the cache with a getpwnam call it succeeded.
    
    This fix makes the behaviour of idmap_backends_unixid_to_sid()
    exactly the same as that of idmap_backends_sid_to_unixid()
    
    Michael
    (cherry picked from commit da7eb5e22e56ea718e393375085cf66a90afafc8)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit d4bc1f8d79929dc1a1d06e92eaf85923a1848e6f)

commit bfaec4b40353d91a92ffd0d6939b1a5d4df72a0e
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Tue Dec 23 12:10:47 2008 -0800

    Fix more asprintf warnings and some error path errors.
    Jeremy.
    (cherry picked from commit 44ab658b6d80c66f20d80aede7fc7cd2b9a941b1)

commit 6ddb477052eb50ad1154468c71e6fe804b3127e0
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Tue Dec 23 11:57:03 2008 -0800

    More asprintf warning fixes.
    Jeremy.
    (cherry picked from commit b37c96a4fcf35ba2208078a53bf9484dcd31bd31)

commit b8454188f9ae1b7ce5bb2a06b556fb8098dc5c70
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Tue Dec 23 11:45:40 2008 -0800

    More asprintf warning fixes.
    Jeremy.
    (cherry picked from commit badf7dc63fe96930700e7ea04d6d6f66a7a8c1f3)

commit 3062b231c636cbdad8b83f7f340d9fccbb9382d5
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Tue Dec 23 11:29:02 2008 -0800

    Fix more asprintf errors and error code paths.
    Jeremy.
    (cherry picked from commit 0f02a165e23d716dcf3791eeaa6a5afebe7a1f88)

commit 31c1e2433a55317bfa8b6d73e66374db2d612612
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Tue Dec 23 10:42:38 2008 -0800

    Fix more ‘asprintf’, declared with attribute warn_unused_result.
    Jeremy.
    (cherry picked from commit 9ebaf67d1dce717cafd5761b2f66296712a09957)

commit fe13b229aa6d3e271f633ba64e05f72d63031a1d
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Tue Dec 23 10:27:37 2008 -0800

    Fix more "warning: ignoring return value of ‘asprintf’, declared with
    attribute warn_unused_result"
    Jeremy.
    (cherry picked from commit f0c0f2bee3bb874ba841a3b73c8677cd0ba67873)

commit c559640ba282928eca4cafa65a1f1f5d4d463f65
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Tue Dec 23 09:49:47 2008 -0800

    Fix another "format not a string literal and no format arguments" warning.
    Jeremy
    (cherry picked from commit fc04faf9668bf0176ffd8d5c20e65aa83d63021b)

commit 3000c845ec67577937bc620dc7afd0ddc4ae0de5
Author: Tim Prouty <tprouty at samba.org>
Date:   Tue Dec 23 09:20:06 2008 -0800

    s3: Fix stream marshalling to return the correct streaminfo status
    
    When there are enough streams on a file to fill up the max_data_count
    when responding to a trans2 streaminfo, samba is returning
    NT_STATUS_BUFFER_TOO_SMALL.  Windows handles this by returning
    NT_STATUS_BUFFER_OVERFLOW while still sending as much of the data that
    it can fit into the buffer.  When the windows client sees
    BUFFER_OVERFLOW, it retries the streaminfo with a larger buffer (2x).
    The windows client starts at 2K and will continue increasing the
    buffer size by two until it reaches 64K.  If the streams don't fit in
    64K the windows client seems to give up.
    
    This patch fixes marshall_stream_info to overfill the buffer by 1
    stream so that send_trans2_replies can properly detect the overflow
    and return the correct status.
    (cherry picked from commit 3643a1179df42d47c2913c7d5c6a4ec8d8b8eb9d)

commit 88806e9fcc5c721a6763db9ed41e4b8feab15cc0
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Mon Dec 22 20:05:45 2008 -0800

    In gcc version 4.3.2 we get warnings for functions declared with
    attribute warn_unused_result. Start to fix these.
    Jeremy.
    (cherry picked from commit dfd983881341bfbc811199901ae3d8fe973649c1)

commit ba0ebf649ae8981e4dd023d4afcd04a34fb3e87b
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date:   Mon Dec 22 11:06:29 2008 -0800

    Fix "allow trusted domain" so it disables trusted domains.
    (cherry picked from commit 2d6946bf3a3b7465c92e707ef136e34996ae90be)

commit b229fa21a185510e1a3689292f363516ba947b39
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sun Dec 21 09:15:17 2008 +0100

    WHATSNEW: Add "ldap ssl = start tls" to the release notes.
    
    Karolin
    (cherry picked from commit 9a94c466210097c852d7e049a57e5777dea6ad84)

commit 881a3e7211c077236253e9748b9ac2dc060a4941
Author: root <root at bando.(none)>
Date:   Sun Dec 21 08:55:30 2008 +0100

    s3:loadparm/docs: Set default for "ldap ssl" to "start tls".
    
    This has been discussed on samba-technical before.
    3.3 and newer only!
    
    Karolin
    (cherry picked from commit a89f7c1f82b03d23a140bdee46b9a60cb8547330)

commit 3c2a4842ae8a0d90f131330e35e830a16283cd65
Author: Karolin Seeger <kseeger at samba.org>
Date:   Sun Dec 21 08:23:39 2008 +0100

    s3: loadparm: Clean-up list of parameters.
    
    We don't need to list several combinations of lowercase and uppercase here.
    
    Karolin
    (cherry picked from commit f2f9956a8ae1f2d6b1807c848961d797549b696b)

commit a008189a10a8b9c4c56cca4ceb300f52fa9bdc23
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 19 13:58:22 2008 -0800

    Fix bug #5986 - Editing a stream is broken (rename problems).
    Jeremy.
    (cherry picked from commit d53aa6257d39313b1b493805a2a73774e07faf8a)

commit f312f7e7e076f864d836ff3f8fee8d8183073fac
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Dec 19 12:05:19 2008 -0800

    Fix a "ignoring function call result" warning
    (cherry picked from commit bb168470676a610cd77cde196260611a49ddf5d1)

commit 30885c46c7898ebd79e5b35ee251f34e3ef302b0
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Dec 19 12:12:59 2008 +0100

    correct the description of the "ldap timeout" parameter
    (cherry picked from commit 1aff97bc48844afba5de48447fdcdcc02d163a97)
    (cherry picked from commit 64656ac02cd9d46224f17f840b4e2c0a9ddf6ba9)

commit 7239afc90af8bcc512b68b9730cbbf611313c450
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 18 15:36:34 2008 -0800

    Comment out the parent inheritance code (this is incorrect) as was
    done for POSIX ACLs.
    Jeremy.
    (cherry picked from commit 19b6d80d6bb1d144ac0a303b09e208750b959ee6)

commit 934b2cb5664daa7324a0c95f6e78743c6d67fc7b
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Dec 18 13:28:09 2008 -0800

    Fix bug #5980 - Race condition when granting level2 oplocks can cause break notify to be missed.
    Jeremy.
    (cherry picked from commit 61ec751fe3560b47681d414506eca934786e122d)

commit 0a802a12440d269dcc6a33d8c9f1b47e86c0730a
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 17 17:22:34 2008 -0800

    Fix bug #5979 - Level 2 oplocks being granted improperly,
    Jeremy.
    (cherry picked from commit da1852f65188efc559738c2e5da295b702ad4619)

commit ae5e1927fa1574d248ee029a8a6b18bb4497c861
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 22:27:39 2008 +0100

    packaging(RHEL-CTDB): fix typo in [u]mount.cifs installation
    
    Michael
    (cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 801e8bbdebe2d5136faf7348294b3cb5a1d43d7e)

commit d6692b8bdb67d9af851205d6495d0e65fa617c87
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 18:56:34 2008 +0100

    packaging(RHEL-CTDB): fix build of [u]mount.cifs
    
    mount.cifs is now built by make everything.
    And it needs extra objects anyways (mtab.o),
    which is why the build of mount.cifs failed.
    
    Michael
    (cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 5b572dea08d804797a3265ca5fe4c09177ed768f)

commit c99ddf7ae0363ea33f9fe682ebae23ff8210349f
Author: Michael Adam <obnox at samba.org>
Date:   Wed Dec 17 16:59:24 2008 +0100

    packaging(RHEL-CTDB): Fix accidential linebreak
    
    Michael
    (cherry picked from commit 5cd8ff8a2aba6b1d6821d4ebb986449b03d40542)
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit e67dc7b73bbd4a7fe9973d7cd6dee052a65b09be)

commit 5fbfeb0fea3590fa6e018249527ba6994e36c882
Author: Volker Lendecke <vl at sernet.de>
Date:   Wed Dec 17 18:14:09 2008 +0100

    Fix a valgrind error
    
    Reported by naga_kishore_kommuri at yahoo.com
    
    Derrel, please check!
    
    Thanks,
    
    Volker
    (cherry picked from commit 3356b95f72e26ede4ab16a12c334be90b8b1a639)
    (cherry picked from commit 1117be19afb71d595ce4215e4760b18ff2e93869)

commit a2ee630e29153074994bbdf3e350d72afe92e187
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Dec 17 16:26:43 2008 +0100

    s3/smb.h: Remove unused LDAP_SSL_ON.
    
    LDAP_SSL_ON is not defined at all.
    Ldaps can be used by specifying an ldaps URL using the "passdb backend"
    parameter.
    
    Karolin
    (cherry picked from commit 0c6cf1f8793edfde924289aafbd174ce4a4fae0c)

commit 01428634e39a764b803b4ba7157d79f6e53c5fa9
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Dec 17 15:53:51 2008 +0100

    s3/loadparm.c: Change default value for "ldap ssl".
    
    LDAP_SSL_ON is not defined at all. That's why the actual default value
    was "" for a long time. Set a more sensible default value without chnging the
    default behaviour.
    
    -----8<------------------snip--------------8<--------------
    user at host:/data/git/samba/v3-0-test/source> git grep LDAP_SSL_ON | cat
    include/smb.h:enum ldap_ssl_types {LDAP_SSL_ON, LDAP_SSL_OFF,
    LDAP_SSL_START_TLS};
    param/loadparm.c:       Globals.ldap_ssl = LDAP_SSL_ON;
    ----->8------------------snap-------------->8--------------
    
    It's the same in 3.2 and 3.3 series.
    
    Karolin
    (cherry picked from commit e6d883e003d4560c55259ae1cfdf7319602f76e3)

commit 63fc23c24e447b5583ebb96d606fc4065ce5ff28
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Dec 17 16:28:59 2008 +0100

    docs: Fix typo in man idmap_hash.
    
    Karolin
    (cherry picked from commit 994ef68164c12a3b0494f6491bc9f402c912600f)
    (cherry picked from commit 5f7b6f6a3f31b77d133a40b8951ce78b86510135)

commit ef7d2e634bba6cd0dfe339f4eef55edea7fc75ca
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Dec 17 16:18:38 2008 +0100

    docs: Update section "ldap ssl" in man smb.conf.
    
    Remove non-existent value "on".
    Change default value to "no".
    Add hint about ldaps.
    
    Karolin
    (cherry picked from commit 580461629bb88ce3b61770e7abfe2c942a121877)
    (cherry picked from commit d74356627579fe7b9961844a77c4e6daa978d62b)

commit c44dcaf9b8cc36a6cb031cbc6fd6ce0ef1776118
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Dec 17 15:42:12 2008 +0100

    docs: Fix some formatting issues in the "ldap ssl" section of man smb.conf.
    
    Karolin
    (cherry picked from commit 6ac36698e975649d26e3f2975c2101129c3ffe97)
    (cherry picked from commit 655a1c7b05d56326d6cfffbc8e46e1d64565717a)

commit b9068d70bcc563be6df84fc7b9745c12f367741c
Author: Lars Müller <lars at samba.org>
Date:   Wed Dec 17 15:39:35 2008 +0100

    Tweak with pam defines of older Linux versions
    
    PAM_AUTHTOK_RECOVERY_ERR is not defined by older Linux versions (SUSE
    Linux Enterprise 9 and RedHat Enterprise 4).
    
    Patch suggested by Philipp Thomas <pth at suse dot de>.
    (cherry picked from commit b6e1eb476ccd19209ed135ab8c3b7b2b10422b0e)

commit 037a1ca4477c3ed09a9f3c39f7190f6f7ecf88ce
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Dec 17 09:17:26 2008 +0100

    docs: Fix TOC of generated HTML docs.
    
    This fixes bug #5968.
    Thanks to Christian Perrier <bubulle at debian.org> for reporting!
    
    Karolin
    (cherry picked from commit 675b363b712e0b91b9b7d1189a819a36853db539)
    (cherry picked from commit 3566615292f9cb2d00b03156e515274751e05969)

commit 6e016ecc7a42ff87a1d4edc7a1f58e8e8fc65211
Author: Kai Blin <kai at samba.org>
Date:   Tue Dec 16 13:42:12 2008 -0800

    (Fixed) Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentation fault (with NAS-BASIC server).
    (cherry picked from commit 52654119cbf15acf6c4663b171df04e9a2bc26b7)

commit 88ce69796bb46c11d7d2747fe2cf43d0f79caa15
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 16 13:36:06 2008 -0800

    Revert "Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentation fault (with NASBASIC server)."
    Error in commit !
    
    This reverts commit e3cb04101453762cda13f16e3e48d704761d5d67.
    (cherry picked from commit 4617080b6c4b80bee9c5ebe596636229f778fa62)

commit d16fd4150d573d2aca4ec8c1cd2c36f7a1f2a55f
Author: Kai Blin <kai at samba.org>
Date:   Tue Dec 16 13:15:48 2008 -0800

    Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentation fault (with NASBASIC server).
    (cherry picked from commit e3cb04101453762cda13f16e3e48d704761d5d67)

commit bcb07054c88f484753dd50d25359c46ea8225287
Author: SATOH Fumiyasu <fumiyas at osstech.jp>
Date:   Wed Dec 17 00:54:30 2008 +0900

    commit b520befe6f51644d20434add9864d7a2fa30aa2e
    Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
    Date:   Wed Dec 17 00:42:25 2008 +0900
    
        libsmbclient: Fix SIGBUS on non-x86 CPUs
    
        We must align the struct smbc_dirent in the struct
        SMBC_internal_data because the struct smbc_dirent
        has numeric values that require alignment.
    
    Signed-off-by: Derrell Lipman <derrell.lipman at unwireduniverse.com>
    (cherry picked from commit 2957c03ab59735159aaf108e87a2e571f984fb5d)

commit 77259611c26145cf179fa706b863fdc13b16c264
Author: SATOH Fumiyasu <fumiyas at osstech.jp>
Date:   Tue Dec 16 16:59:07 2008 +0100

    nss_winbind: Solaris 64-bit fix and...
    
    PATCH 1:
    Fix gmem->numgids and gmem->maxgids breakage on Solaris 64-bit
    because sizeof(int) != sizeof(long int).
    
    PATCH 2:
    This patch fixes a compile-time warning
    "warning: implicit function declaration: _nss_winbind_initgroups_dyn".
    (cherry picked from commit cb036772d09227f870c2fec3ecd8c3f53787dfbc)
    (cherry picked from commit 085f4cdb90b12d60804001fd60659a4aa4a174fd)

commit 95afbc350b0a93af5e9c660f7f4dc08f13129295
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Dec 16 15:10:29 2008 +0100

    docs: "acl compatibility" is a global parameter.
    
    This fixes bug #5866.
    Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
    
    Karolin
    (cherry picked from commit 9e64ed018e5aa84d802b01953b481fbb07eb00aa)
    (cherry picked from commit 386b0fc4bdc0822ffbc51cfee536bea23df0a755)

commit 055de84f3e3b2aea181c97539d7a11b19c5aea31
Author: Holger Hetterich <hhetter at novell.com>
Date:   Thu Nov 20 10:32:14 2008 +0100

    Add an entry for the "check" command to the tdbtool manpage.
    (cherry picked from commit c46c21cde33a9cc1de9d947de64c27052ecce988)

commit a1dcf735da8128ca28ec325bb7a0596b61d213e9
Author: Holger Hetterich <hhetter at novell.com>
Date:   Sun Nov 2 00:12:32 2008 +0100

    Added a simple tdb integrity check to tdbtool. The command "check" runs traverse on the currently open tdb, and returns the number of entries if the integrity check is successful.
    (cherry picked from commit 12629532985ac9fdc900d8811c33651587d0796d)

commit 4bf2adeb5e8769141ad74d445bead5cb8e59706c
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Dec 16 12:03:45 2008 +0100

    docs: Raise version number from 3.2 to 3.3.
    
    Karolin
    (cherry picked from commit 37543c74d72c1e76df6ff8eeae45883777044bf5)

commit 5533cf6234be930b2565f9036537405bf37a0916
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Dec 16 11:18:45 2008 +0100

    docs: Remove comment about default backend.
    
    Karolin
    (cherry picked from commit 46f530e42f42b860407696f4e4733ad88e69f1be)
    (cherry picked from commit 7cda2d4e26d82ed02719fb098a15760065420658)

commit 08a28e7de190c281237dae48711870612c6b59eb
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Dec 16 09:04:32 2008 +0100

    docs: Fix typo in the idmap_ad manpage.
    
    Karolin
    (cherry picked from commit b876e1336bed52e0823e0e88381d223bd6aa95e4)
    (cherry picked from commit 611ac35a694930693d2f773d15e59be138261a8e)

commit 0fef3e1279e42446a9d60a142bc031e234cfec4e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 15 16:47:38 2008 +0100

    s3:net_status: use dbwrap to open sessionid.tdb
    
    metze
    (cherry picked from commit 8891b2b0215a3609fcc8c5f9aa3e2fbcf05c6290)
    (cherry picked from commit 598bf8fbe38d76adca2e067c90987d9cd31e8a3e)

commit 3c6f3bb6998f821f253a0c53bb2b7157475bf073
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 15 12:46:04 2008 +0100

    Fix bug 5969: Optimize smbclient put command
    
    This used to be checkin 3f0406f6 to master
    (cherry picked from commit 91ecce438f0fd38ac933ba9bc493e79f8eb5a63a)

commit 1ae75d7a3dc0ebff7f4112a2f398f2e171bd0443
Author: Michael Adam <obnox at samba.org>
Date:   Mon Dec 15 11:38:32 2008 +0100

    fix build of pam_winbind.so on older Linux systems.
    
    Older pam implementations on Linux define PAM_AUTHTOK_RECOVER_ERR
    instead of PAM_AUTHTOK_RECOVERY_ERR. We have always defined and
    are using PAM_AUTHTOK_RECOVER_ERR in all other places.
    
    Michael
    (cherry picked from commit d217acb9066b9a6282be3ff737d78e5d9c985ae1)

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

Summary of changes:
 WHATSNEW.txt                                 |   13 +
 docs-xml/htmldocs.html                       |    8 +-
 docs-xml/manpages-3/cifs.upcall.8.xml        |    2 +-
 docs-xml/manpages-3/eventlogadm.8.xml        |    2 +-
 docs-xml/manpages-3/findsmb.1.xml            |    2 +-
 docs-xml/manpages-3/idmap_ad.8.xml           |   14 +-
 docs-xml/manpages-3/idmap_adex.8.xml         |    2 +-
 docs-xml/manpages-3/idmap_hash.8.xml         |    4 +-
 docs-xml/manpages-3/idmap_ldap.8.xml         |    2 +-
 docs-xml/manpages-3/idmap_nss.8.xml          |    2 +-
 docs-xml/manpages-3/idmap_rid.8.xml          |    2 +-
 docs-xml/manpages-3/idmap_tdb.8.xml          |    2 +-
 docs-xml/manpages-3/ldb.3.xml                |    2 +-
 docs-xml/manpages-3/ldbadd.1.xml             |    2 +-
 docs-xml/manpages-3/ldbdel.1.xml             |    2 +-
 docs-xml/manpages-3/ldbedit.1.xml            |    2 +-
 docs-xml/manpages-3/ldbmodify.1.xml          |    2 +-
 docs-xml/manpages-3/ldbsearch.1.xml          |    2 +-
 docs-xml/manpages-3/libsmbclient.7.xml       |    2 +-
 docs-xml/manpages-3/lmhosts.5.xml            |    2 +-
 docs-xml/manpages-3/log2pcap.1.xml           |    2 +-
 docs-xml/manpages-3/mount.cifs.8.xml         |    2 +-
 docs-xml/manpages-3/net.8.xml                |    2 +-
 docs-xml/manpages-3/nmbd.8.xml               |    2 +-
 docs-xml/manpages-3/nmblookup.1.xml          |    2 +-
 docs-xml/manpages-3/ntlm_auth.1.xml          |    2 +-
 docs-xml/manpages-3/pam_winbind.7.xml        |    2 +-
 docs-xml/manpages-3/pdbedit.8.xml            |    2 +-
 docs-xml/manpages-3/profiles.1.xml           |    2 +-
 docs-xml/manpages-3/rpcclient.1.xml          |    2 +-
 docs-xml/manpages-3/samba.7.xml              |    2 +-
 docs-xml/manpages-3/smb.conf.5.xml           |    2 +-
 docs-xml/manpages-3/smbcacls.1.xml           |    2 +-
 docs-xml/manpages-3/smbclient.1.xml          |    2 +-
 docs-xml/manpages-3/smbcontrol.1.xml         |    2 +-
 docs-xml/manpages-3/smbcquotas.1.xml         |    2 +-
 docs-xml/manpages-3/smbd.8.xml               |    2 +-
 docs-xml/manpages-3/smbget.1.xml             |    2 +-
 docs-xml/manpages-3/smbgetrc.5.xml           |    2 +-
 docs-xml/manpages-3/smbpasswd.5.xml          |    2 +-
 docs-xml/manpages-3/smbpasswd.8.xml          |    2 +-
 docs-xml/manpages-3/smbspool.8.xml           |    2 +-
 docs-xml/manpages-3/smbstatus.1.xml          |    2 +-
 docs-xml/manpages-3/smbtar.1.xml             |    2 +-
 docs-xml/manpages-3/smbtree.1.xml            |    2 +-
 docs-xml/manpages-3/swat.8.xml               |    2 +-
 docs-xml/manpages-3/tdbbackup.8.xml          |    2 +-
 docs-xml/manpages-3/tdbdump.8.xml            |    2 +-
 docs-xml/manpages-3/tdbtool.8.xml            |   10 +-
 docs-xml/manpages-3/testparm.1.xml           |    2 +-
 docs-xml/manpages-3/umount.cifs.8.xml        |    2 +-
 docs-xml/manpages-3/vfs_audit.8.xml          |    2 +-
 docs-xml/manpages-3/vfs_cacheprime.8.xml     |    2 +-
 docs-xml/manpages-3/vfs_cap.8.xml            |    2 +-
 docs-xml/manpages-3/vfs_catia.8.xml          |    2 +-
 docs-xml/manpages-3/vfs_commit.8.xml         |    2 +-
 docs-xml/manpages-3/vfs_default_quota.8.xml  |    2 +-
 docs-xml/manpages-3/vfs_extd_audit.8.xml     |    2 +-
 docs-xml/manpages-3/vfs_fake_perms.8.xml     |    2 +-
 docs-xml/manpages-3/vfs_full_audit.8.xml     |    2 +-
 docs-xml/manpages-3/vfs_gpfs.8.xml           |    2 +-
 docs-xml/manpages-3/vfs_netatalk.8.xml       |    2 +-
 docs-xml/manpages-3/vfs_notify_fam.8.xml     |    2 +-
 docs-xml/manpages-3/vfs_prealloc.8.xml       |    2 +-
 docs-xml/manpages-3/vfs_readahead.8.xml      |    2 +-
 docs-xml/manpages-3/vfs_readonly.8.xml       |    2 +-
 docs-xml/manpages-3/vfs_recycle.8.xml        |    2 +-
 docs-xml/manpages-3/vfs_shadow_copy.8.xml    |    2 +-
 docs-xml/manpages-3/vfs_streams_depot.8.xml  |    2 +-
 docs-xml/manpages-3/vfs_streams_xattr.8.xml  |    2 +-
 docs-xml/manpages-3/vfs_xattr_tdb.8.xml      |    2 +-
 docs-xml/manpages-3/vfstest.1.xml            |    2 +-
 docs-xml/manpages-3/wbinfo.1.xml             |    2 +-
 docs-xml/manpages-3/winbindd.8.xml           |    2 +-
 docs-xml/smbdotconf/ldap/ldapssl.xml         |   37 +-
 docs-xml/smbdotconf/ldap/ldaptimeout.xml     |    4 +-
 docs-xml/smbdotconf/vfs/aclcompatibility.xml |    2 +-
 packaging/RHEL-CTDB/makespec.sh              |    3 +-
 packaging/RHEL-CTDB/samba.spec.tmpl          |   10 +-
 source/client/client.c                       |   60 ++-
 source/client/clitar.c                       |   17 +-
 source/include/ctdbd_conn.h                  |    4 +-
 source/include/libsmb_internal.h             |   13 +-
 source/include/passdb.h                      |   10 +-
 source/include/proto.h                       |   13 +-
 source/include/smb.h                         |    4 +-
 source/lib/ctdbd_conn.c                      |   26 +-
 source/lib/dbwrap_ctdb.c                     |   32 +-
 source/lib/dbwrap_util.c                     |    4 +-
 source/lib/fault.c                           |   34 +-
 source/lib/ldb/include/ldb.h                 |    2 +-
 source/lib/replace/test/os2_delete.c         |    8 +-
 source/lib/socket_wrapper/socket_wrapper.c   |   12 +-
 source/lib/system.c                          |   25 +
 source/lib/tdb/tools/tdbtool.c               |   31 +-
 source/lib/util_sock.c                       |  115 +++-
 source/lib/xfile.c                           |   25 +-
 source/libads/ads_struct.c                   |   11 +-
 source/libads/kerberos_keytab.c              |   20 +-
 source/libads/kerberos_verify.c              |   31 +-
 source/libads/krb5_setpw.c                   |   27 +-
 source/libads/ldap.c                         |   14 +-
 source/libads/ldap_printer.c                 |   26 +-
 source/libads/ldap_user.c                    |    5 +-
 source/libads/util.c                         |   12 +-
 source/libnet/libnet_join.c                  |    3 +-
 source/libnet/libnet_samsync_ldif.c          |    7 +-
 source/libsmb/clientgen.c                    |   40 +-
 source/libsmb/clilist.c                      |    9 +-
 source/libsmb/libsmb_dir.c                   |   10 +-
 source/libsmb/libsmb_xattr.c                 |    3 +-
 source/libsmb/passchange.c                   |   78 ++-
 source/locking/locking.c                     |   11 +-
 source/locking/posix.c                       |   13 +-
 source/modules/vfs_acl_tdb.c                 |    2 +
 source/modules/vfs_acl_xattr.c               |    2 +
 source/modules/vfs_default.c                 |   14 +
 source/modules/vfs_netatalk.c                |    8 +-
 source/modules/vfs_recycle.c                 |   13 +-
 source/nsswitch/pam_winbind.c                |    4 +-
 source/nsswitch/pam_winbind.h                |    9 +-
 source/nsswitch/winbind_nss_solaris.c        |    9 +-
 source/nsswitch/winbind_nss_solaris.h        |    3 +
 source/param/loadparm.c                      |   11 +-
 source/passdb/login_cache.c                  |    7 +-
 source/passdb/passdb.c                       |  767 ++++++++++++++++++++++++--
 source/passdb/pdb_interface.c                |   22 +-
 source/passdb/pdb_ldap.c                     |    7 +-
 source/passdb/pdb_tdb.c                      |  788 ++------------------------
 source/printing/notify.c                     |    2 +-
 source/printing/nt_printing.c                |   22 +-
 source/printing/print_cups.c                 |    4 +
 source/printing/print_generic.c              |    4 +-
 source/printing/printfsp.c                   |   10 +-
 source/rpc_server/srv_lsa_hnd.c              |   11 +-
 source/rpcclient/cmd_spoolss.c               |   45 ++-
 source/script/mkbuildoptions.awk             |   14 +-
 source/smbd/fileio.c                         |    9 +-
 source/smbd/open.c                           |  163 ++++---
 source/smbd/oplock.c                         |   54 ++-
 source/smbd/password.c                       |   23 +-
 source/smbd/reply.c                          |   11 +-
 source/smbd/seal.c                           |    3 +-
 source/smbd/server.c                         |   11 +-
 source/smbd/trans2.c                         |   32 +-
 source/torture/nbio.c                        |   19 +-
 source/torture/torture.c                     |   18 +-
 source/torture/utable.c                      |    6 +-
 source/utils/eventlogadm.c                   |    4 +-
 source/utils/net_ads.c                       |   35 +-
 source/utils/net_cache.c                     |    5 +-
 source/utils/net_lookup.c                    |    8 +-
 source/utils/net_rpc.c                       |    8 +-
 source/utils/net_status.c                    |   44 +-
 source/utils/net_time.c                      |    4 +-
 source/utils/net_util.c                      |    3 +-
 source/utils/profiles.c                      |    2 +-
 source/utils/smbget.c                        |   28 +-
 source/web/cgi.c                             |    4 +-
 source/web/neg_lang.c                        |    3 +-
 source/web/swat.c                            |    8 +-
 source/winbindd/idmap.c                      |   10 -
 source/winbindd/winbindd.c                   |    7 +-
 source/winbindd/winbindd_ads.c               |    5 +-
 source/winbindd/winbindd_cache.c             |    4 +-
 source/winbindd/winbindd_dual.c              |    7 -
 source/winbindd/winbindd_util.c              |   13 +-
 167 files changed, 1953 insertions(+), 1374 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index b5aac3f..76cb29d 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -13,6 +13,7 @@ Major enhancements in Samba 3.3.0 include:
  Configuration/installation:
  o Splitting of library directory into library directory and separate
    modules directory.
+ o The default value of "ldap ssl" has been changed to "start tls".
 
  File Serving:
  o Extended Cluster support.
@@ -45,6 +46,17 @@ A new option "--with-modulesdir" has been added to allow the specification
 of a separate directory for the shared modules.
 
 
+Configuration changes
+=====================
+
+The default value of "ldap ssl" has been changed to "start tls". This means,
+Samba will use the LDAPv3 StartTLS extended operation (RFC2830) for
+communicating with directory servers by default. If your directory servers
+do not support this extended operation, you will have to set
+"ldap ssl = no". Otherwise, Samba could not contact the directory servers
+anymore!
+
+
 Winbind idmap backend changes
 =============================
 
@@ -167,6 +179,7 @@ smb.conf changes
     idmap domains			Removed
     init logon delayed hosts		New		""
     init logon delay			New		100
+    ldap ssl				Changed Default	start tls
     winbind reconnect delay		New		30
 
 
diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html
index d2be5ef..44fcc0f 100644
--- a/docs-xml/htmldocs.html
+++ b/docs-xml/htmldocs.html
@@ -23,19 +23,15 @@
  <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
 </tr>
 <tr>
- <td valign="top"><a href="../using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
+ <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
  <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
 </tr>
 <tr>
- <td valign="top"><a href="manpages-3/index.html">Man pages</a></td>
+ <td valign="top"><a href="manpages/index.html">Man pages</a></td>
  <td valign="top">The Samba man pages in HTML.</td>
 </tr>
 <tr>
  <td valign="top"><a href="../../WHATSNEW.txt">WHATSNEW</a></td>
   <td valign="top">Samba Release Notes.</td>
 </tr>
-<tr>
- <td valign="top"><a href="../../README.VENDOR">README.VENDOR</a></td>
-  <td valign="top">VENDOR specific information.</td>
-</tr>
 </table></body></html>
diff --git a/docs-xml/manpages-3/cifs.upcall.8.xml b/docs-xml/manpages-3/cifs.upcall.8.xml
index 5faf0f7..9782987 100644
--- a/docs-xml/manpages-3/cifs.upcall.8.xml
+++ b/docs-xml/manpages-3/cifs.upcall.8.xml
@@ -8,7 +8,7 @@
         <manvolnum>8</manvolnum>
         <refmiscinfo class="source">Samba</refmiscinfo>
         <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-        <refmiscinfo class="version">3.2</refmiscinfo>
+        <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 <refnamediv>
diff --git a/docs-xml/manpages-3/eventlogadm.8.xml b/docs-xml/manpages-3/eventlogadm.8.xml
index 04ba022..1fa89fd 100644
--- a/docs-xml/manpages-3/eventlogadm.8.xml
+++ b/docs-xml/manpages-3/eventlogadm.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/findsmb.1.xml b/docs-xml/manpages-3/findsmb.1.xml
index 4824508..0d094a7 100644
--- a/docs-xml/manpages-3/findsmb.1.xml
+++ b/docs-xml/manpages-3/findsmb.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml
index fb0792e..a5aaa8d 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -23,8 +23,8 @@
 	extensions. This module implements only the &quot;idmap&quot;
 	API, and is READONLY. Mappings must be provided in advance
 	by the administrator by adding the posixAccount/posixGroup
-	classess and relative attribute/value pairs to the users and
-	groups objects in AD</para>
+	classes and relative attribute/value pairs to the user and
+	group objects in the AD.</para>
 </refsynopsisdiv>
 
 <refsect1>
@@ -34,7 +34,7 @@
 		<varlistentry>
 		<term>range = low - high</term>
 		<listitem><para>
-			Defines the available matching uid and gid range for which the
+			Defines the available matching UID and GID range for which the
 			backend is authoritative. Note that the range acts as a filter.
 			If specified any UID or GID stored in AD that fall outside the
 			range is ignored and the corresponding map is discarded.
@@ -47,7 +47,7 @@
 		<listitem><para>
 			Defines the schema that idmap_ad should use when querying
 			Active Directory regarding user and group information.
-			This can either the RFC2307 schema support included
+			This can be either the RFC2307 schema support included
 			in Windows 2003 R2 or the Service for Unix (SFU) schema.
 		</para></listitem>
 		</varlistentry>
@@ -58,8 +58,8 @@
 	<title>EXAMPLES</title>
 	<para>
 	The following example shows how to retrieve idmappings from our principal and
-	and trusted AD domains. All is needed is to set default to yes. If trusted
-	domains are present id conflicts must be resolved beforehand, there is no
+	and trusted AD domains. If trusted domains are present id conflicts must be
+	resolved beforehand, there is no
 	guarantee on the order conflicting mappings would be resolved at this point.
 
 	This example also shows how to leave a small non conflicting range for local
diff --git a/docs-xml/manpages-3/idmap_adex.8.xml b/docs-xml/manpages-3/idmap_adex.8.xml
index 9eb2ff7..3668c71 100644
--- a/docs-xml/manpages-3/idmap_adex.8.xml
+++ b/docs-xml/manpages-3/idmap_adex.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/idmap_hash.8.xml b/docs-xml/manpages-3/idmap_hash.8.xml
index 8e452b3..0e2fcfa 100644
--- a/docs-xml/manpages-3/idmap_hash.8.xml
+++ b/docs-xml/manpages-3/idmap_hash.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -37,7 +37,7 @@
 		    Specifies the absolute path to the name mapping
 		    file used by the nss_info API.  Entries in the file
 		    are of the form &quot;<replaceable>unix name</replaceable>
-		    = <replaceable>qualified domain name</replaceable>&quote;.
+		    = <replaceable>qualified domain name</replaceable>&quot;.
 		    Mapping of both user and group names is supported.
 		</para></listitem>
 		</varlistentry>
diff --git a/docs-xml/manpages-3/idmap_ldap.8.xml b/docs-xml/manpages-3/idmap_ldap.8.xml
index c09c141..5bd65aa 100644
--- a/docs-xml/manpages-3/idmap_ldap.8.xml
+++ b/docs-xml/manpages-3/idmap_ldap.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/idmap_nss.8.xml b/docs-xml/manpages-3/idmap_nss.8.xml
index 7d3503b..be5c2d8 100644
--- a/docs-xml/manpages-3/idmap_nss.8.xml
+++ b/docs-xml/manpages-3/idmap_nss.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/idmap_rid.8.xml b/docs-xml/manpages-3/idmap_rid.8.xml
index 5eba356..6839bc8 100644
--- a/docs-xml/manpages-3/idmap_rid.8.xml
+++ b/docs-xml/manpages-3/idmap_rid.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/idmap_tdb.8.xml b/docs-xml/manpages-3/idmap_tdb.8.xml
index 4258d95..e535bf0 100644
--- a/docs-xml/manpages-3/idmap_tdb.8.xml
+++ b/docs-xml/manpages-3/idmap_tdb.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/ldb.3.xml b/docs-xml/manpages-3/ldb.3.xml
index a19422a..564b92b 100644
--- a/docs-xml/manpages-3/ldb.3.xml
+++ b/docs-xml/manpages-3/ldb.3.xml
@@ -7,7 +7,7 @@
 	<manvolnum>3</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">C Library Functions</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 <refnamediv>
diff --git a/docs-xml/manpages-3/ldbadd.1.xml b/docs-xml/manpages-3/ldbadd.1.xml
index fb57be2..4f7f51e 100644
--- a/docs-xml/manpages-3/ldbadd.1.xml
+++ b/docs-xml/manpages-3/ldbadd.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/ldbdel.1.xml b/docs-xml/manpages-3/ldbdel.1.xml
index 158c5f1..ef7f928 100644
--- a/docs-xml/manpages-3/ldbdel.1.xml
+++ b/docs-xml/manpages-3/ldbdel.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/ldbedit.1.xml b/docs-xml/manpages-3/ldbedit.1.xml
index 2d11ca9..4c1a5a0 100644
--- a/docs-xml/manpages-3/ldbedit.1.xml
+++ b/docs-xml/manpages-3/ldbedit.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
     </refmeta>
 
 
diff --git a/docs-xml/manpages-3/ldbmodify.1.xml b/docs-xml/manpages-3/ldbmodify.1.xml
index a46ae50..bab043c 100644
--- a/docs-xml/manpages-3/ldbmodify.1.xml
+++ b/docs-xml/manpages-3/ldbmodify.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/ldbsearch.1.xml b/docs-xml/manpages-3/ldbsearch.1.xml
index 398860b..2e855d1 100644
--- a/docs-xml/manpages-3/ldbsearch.1.xml
+++ b/docs-xml/manpages-3/ldbsearch.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/libsmbclient.7.xml b/docs-xml/manpages-3/libsmbclient.7.xml
index ec95004..e9c9ba4 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages-3/libsmbclient.7.xml
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">7</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/lmhosts.5.xml b/docs-xml/manpages-3/lmhosts.5.xml
index fca0616..358c0dc 100644
--- a/docs-xml/manpages-3/lmhosts.5.xml
+++ b/docs-xml/manpages-3/lmhosts.5.xml
@@ -7,7 +7,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/log2pcap.1.xml b/docs-xml/manpages-3/log2pcap.1.xml
index d6debe7..5488132 100644
--- a/docs-xml/manpages-3/log2pcap.1.xml
+++ b/docs-xml/manpages-3/log2pcap.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index 51a22b3..ff9ab66 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 75f85e1..1fb720a 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/nmbd.8.xml b/docs-xml/manpages-3/nmbd.8.xml
index 19e6f4f..207be78 100644
--- a/docs-xml/manpages-3/nmbd.8.xml
+++ b/docs-xml/manpages-3/nmbd.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/nmblookup.1.xml b/docs-xml/manpages-3/nmblookup.1.xml
index 85640da..9eadbb0 100644
--- a/docs-xml/manpages-3/nmblookup.1.xml
+++ b/docs-xml/manpages-3/nmblookup.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index 50085d4..ac23326 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/pam_winbind.7.xml b/docs-xml/manpages-3/pam_winbind.7.xml
index 7f233c1..23fcafc 100644
--- a/docs-xml/manpages-3/pam_winbind.7.xml
+++ b/docs-xml/manpages-3/pam_winbind.7.xml
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">7</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index 41dc9b0..d761f0b 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/profiles.1.xml b/docs-xml/manpages-3/profiles.1.xml
index 0d3224d..bd6c9ca 100644
--- a/docs-xml/manpages-3/profiles.1.xml
+++ b/docs-xml/manpages-3/profiles.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages-3/rpcclient.1.xml
index 2c2e42a..9d4be80 100644
--- a/docs-xml/manpages-3/rpcclient.1.xml
+++ b/docs-xml/manpages-3/rpcclient.1.xml
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/samba.7.xml b/docs-xml/manpages-3/samba.7.xml
index a83c7a0..708bcb7 100644
--- a/docs-xml/manpages-3/samba.7.xml
+++ b/docs-xml/manpages-3/samba.7.xml
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">Miscellanea</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff --git a/docs-xml/manpages-3/smb.conf.5.xml b/docs-xml/manpages-3/smb.conf.5.xml
index bb157e5..1f60c3d 100644
--- a/docs-xml/manpages-3/smb.conf.5.xml
+++ b/docs-xml/manpages-3/smb.conf.5.xml
@@ -6,7 +6,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>


-- 
Samba Shared Repository


More information about the samba-cvs mailing list