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

Karolin Seeger kseeger at samba.org
Sat Jan 22 03:22:09 MST 2011


The branch, v3-4-stable has been updated
       via  247949c WHATSNEW: Add major enhancements.
       via  2cda481 WHATSNEW: Update changes since 3.4.9.
       via  18412f6 WHATSNEW: Start to add changes since 3.4.9.
       via  efb89c2 s3-rpcclient: Fix bug #7880: cmd_spoolss_deletedriver() returned without checking all architectures.
       via  0e1aec4 s3-dns Don't use DELEG_FLAG in DNS update, Windows 2008R2 does not like it (cherry picked from commit 280caa6b3bb1199939f9349ea5a436a491c81791)
       via  aaf6e34 s3-dns Don't use SEQUENCE_FLAG in DNS update, Windows 2008R2 does not like it
       via  94fd3a5 WHATSNEW: Start release notes for Samba 3.4.10.
       via  4717c6f VERSION: Bump version number.
       via  5702565 s3-nmbd: Fix bug #7875
       via  0b3aaa3 s3:lib/netapi: don't set SAMR_FIELD_FULL_NAME if we just want to set the account name (bug #7896)
       via  b73822f s3: Fix bug 7066 -- wbcAuthenticateEx gives unix times
       via  8096bb2 Ñ•3/configue: set Tru64 cc's PIC switch right (none)
       via  4559441 Fix bug #7892 - open_file_fchmod() leaves a stale lock. (cherry picked from commit 023aa6f4aae29ba22b3d42c815027ba6a66f8ee2)
       via  133b474 s3: Use smbsock_any_connect in winbind
       via  efa34c0 s3: Retry *SMBSERVER in nb_connect (cherry picked from commit ee2534c18b5afa609ff17d9da7ea10bcf7654fc6)
       via  03e02ad s3: Add smbsock_any_connect (cherry picked from commit 198b6d673787ee40c0ac389ece99cee1844dd585)
       via  607c00d s3: Add an async smbsock_connect
       via  14e272c v3-4-test: Pull in tevent_req_poll_ntstatus from master (cherry picked from commit 9b79de1553cfa57d24d1ac0316b814933ef3d33d)
       via  88ce2c7 s3: Add async cli_session_request
       via  b2a1f5a v3-4-test: Pull in read_smb_send from master (cherry picked from commit 02c4649674d3bd0f54e71910f11d6aff2cdb6c9d)
       via  f338111 s3: Add some const to name_mangle() (cherry picked from commit 56c760ab41b9b4cb9680d873b8f9955be21434f4)
       via  7943955 s3: Make winbind recover from a signing error
       via  fc80176 s3: Stop using the write cache after an oplock break
       via  e3e35fa Fix bug 7636 - winbind internal error, backtrace.
       via  8863dce s3-printing: fix BUG 7280 - auto printers not loading with registry config (cherry picked from commit 9c3537b6d8b2ea36265d3a69f7e90278cb86dbfb)
       via  bd20f12 Fix bug 7590 - offline login fails because winbind deletes cache on every startup.
       via  97f779d rerun: make samba3-idl
       via  00c0580 pidl: Samba3/ClientNDR - Correctly copy arrays, if r.out.size < r.in.size.
       via  6dc20e5 Fix bug #7617 - smbd coredump due to uninitialized variables in the performance counter code.
       via  4447ae9 s3-winbind: Fix Bug #7568: Make sure cm_connect_lsa_tcp does not reset the secure channel.
       via  0c10994 s3-libsmb: Fix bug #7577.
       via  2a1568f librpc: split out a separate GUID_from_ndr_blob() function
       via  d3a6a07 s3: Fix bug 7336: Enable idmap_passdb module build as shared (cherry picked from commit 8c0fbc410798512b7a4b7db73bcb24cde6fa7849) (cherry picked from commit b4803af11525823ea508d0ca4e58402d55901194) (cherry picked from commit 1b22e942aa869d51dc9e50b74c44ece004c30947)
       via  a5fff72 s3-librpc: Fixed GUID_from_data_blob() with length of 32.
       via  f280494 s3-printing: Fix Bug #7541, %D in "printer admin" causing smbd crash.
       via  bf6dbcc s3-docs: Add missing whitespace.
       via  4297ef9 s3-docs: Fix some of ntlm_auth ntlm-server-1 protocol documentation.
       via  1fc9f14 s3: Fix EnumDomainAliases when no aliases are in LDAP
       via  3633fad s3:pdb_ldap: fix bug 7507 - init_sam_from_ldap stores group in sid2uid cache (cherry picked from commit ba809ecb8ab217e4376bf75d2300e146b62b88eb) (cherry picked from commit cc740fb5eb56a0875703753d4a116d2fe33ec186) (cherry picked from commit b206d75ca5ba04a866a22dfca5b7441fb49078d8)
       via  da6259b s3-netdomjoin-gui: Fix Bug #7500. Fix 'not a string literal' warning in netdomjoin-gui.
       via  81f4c22 s3-kerberos: temporary fix for ipv6 in print_kdc_line().
       via  80ad2c9 s3-kerberos: pass down kdc_name to create_local_private_krb5_conf_for_domain().
       via  1f3cea4 s3-winbind: make the getpeername() checks in cm_prepare_connection IPv6 aware.
       via  4d084a8 s3-spoolss: Added EN ISO 216, A0 and A1 to builtin forms.
       via  450c5be s3-docs: Move -D option to the right paragraph in man winbindd.
       via  5c2b44d work around AIX6.1 name space pollution rename mod_name to module_name
       via  10d8bc3 s3-spoolss: Fix _spoolss_EnumPrinters servername handling.
       via  6022a74 s3-spoolss: in spoolss_EnumPrinters r->in.server is a *unique* pointer!
       via  3fc63a6 s3-net: Fix Bug #7417. 'net rpc user password' can set the wrong password.
      from  bfe7b2c WHATSNEW: Update release date.

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


- Log -----------------------------------------------------------------
commit 247949c1706d3a5723fb54363d0670dda277afcb
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Jan 19 15:14:45 2011 +0100

    WHATSNEW: Add major enhancements.
    
    Karolin
    (cherry picked from commit 0d069e7aa3c3075cee6e698d9f7aa734826916ad)

commit 2cda4819031ecf86eeea63db9c20fd4611d5dd86
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 17 18:16:03 2011 +0100

    WHATSNEW: Update changes since 3.4.9.
    
    Karolin
    (cherry picked from commit a215aad589fb30c31e52a34bc5fdbbcbfb91de7f)

commit 18412f664458f602549475a96a87396cb29b4624
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Jan 13 18:36:26 2011 +0100

    WHATSNEW: Start to add changes since 3.4.9.
    
    Karolin
    (cherry picked from commit 948a7b8cef5291ae11ae3fe875c1d53ad9b3b91a)

commit efb89c21b1ff1275977df6b53f327c73ec679c5c
Author: Björn Baumbach <bb at sernet.de>
Date:   Wed Dec 22 15:20:29 2010 +0100

    s3-rpcclient: Fix bug #7880: cmd_spoolss_deletedriver() returned without checking all architectures.
    
    Continues now with next architecture if no driver is available.
    
    Because of the broken behavior of the rpccli_*() functions,
    we need special error code handling.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit f5af66e67d7c6d62315671c0cf57f47973316226)
    (cherry picked from commit dc63f45b523deb5c3d0c4be4239507e5fc4f6a40)
    (cherry picked from commit fbcecec057bc05d6fcbdab3ef90d32c56335e833)

commit 0e1aec461ed69c82987cf86e6b1beb6862cc0fb4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Dec 10 15:32:08 2010 +1100

    s3-dns Don't use DELEG_FLAG in DNS update, Windows 2008R2 does not like it (cherry picked from commit 280caa6b3bb1199939f9349ea5a436a491c81791)
    
    The last 2 patches address bug #7356 (net ads dns register fails in 2008 R2
    domain).
    (cherry picked from commit 6857b749229cc72c604ab5646a4bae5f09b72e11)
    (cherry picked from commit 7cca44fa97762ccde7166a80bec91a7849f029c1)

commit aaf6e34115c2bece85d0dc4f11951b38e9d77637
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Dec 10 15:30:22 2010 +1100

    s3-dns Don't use SEQUENCE_FLAG in DNS update, Windows 2008R2 does not like it
    
    Andrew Bartlett
    (cherry picked from commit 0f1cc889a26477e9a98629f120fe5890b2e106fa)
    (cherry picked from commit 2b463484cc7bb80cdfb6727ab9e5a873faff5ec8)
    (cherry picked from commit 1d2f3742fcb47e4a13e21b8e3b7e22a9ddeba49c)

commit 94fd3a52f64946cf70b492c516bc32b2c4b02a03
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jan 11 21:49:30 2011 +0100

    WHATSNEW: Start release notes for Samba 3.4.10.
    
    Karolin
    (cherry picked from commit 1d1ea2dfaf17c65d0630d982fdf46fa0e805ab09)

commit 4717c6f9c8322e7e8aba5dd82ecc0775ef7ade73
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Jan 11 21:44:50 2011 +0100

    VERSION: Bump version number.
    
    Karolin
    (cherry picked from commit f4762c74c0be61cd3c733d82767878fbb25835ac)

commit 570256543588898e86676bfb71ecafa2291bddca
Author: Björn Baumbach <bb at sernet.de>
Date:   Fri Jan 7 15:53:13 2011 +0100

    s3-nmbd: Fix bug #7875
    
    nmbd --port didn't work
    (cherry picked from commit 79280c99f67c3a3bfb1873b373ec181fa402f18c)
    (cherry picked from commit 2b1a5fad6c681d8ff8e592ee92d8251040c0760d)

commit 0b3aaa3da4ff172155e739829f83f29621991777
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Dec 29 12:08:19 2010 +0100

    s3:lib/netapi: don't set SAMR_FIELD_FULL_NAME if we just want to set the account name (bug #7896)
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Dec 30 18:09:13 CET 2010 on sn-devel-104
    (cherry picked from commit f1d15ea54c313e71fc032b2ed191bdecad868858)
    (cherry picked from commit c6a0971b3790253a906b370562237479d273bb94)
    (cherry picked from commit b46ec13a9a548cf1bc4ada47751f9e6945306bc7)

commit b73822f35f15d296239db6b5bb2ed12075fb7606
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Dec 18 16:02:09 2010 +0100

    s3: Fix bug 7066 -- wbcAuthenticateEx gives unix times
    
    We might eventually want to change this, but right now we get unix times
    out of the winbind pipe struct
    (cherry picked from commit 993923880e213136de89b5b8d59f6f32a51b94b7)
    (cherry picked from commit 15075858886ee208f800f9bfdcfaf6a56d8653de)

commit 8096bb259e62e5a6cba48ae1dd8c40c7b8757c0c
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Nov 26 01:32:53 2010 +0100

    Ñ•3/configue: set Tru64 cc's PIC switch right (none)
    
    -fPIC made shared library builds fail there
    
    Fixes #7821
    
    (cherry picked from commit dbcf73c45782c310cb7ff1f2177d410399e2f06d)
    (cherry picked from commit 83eb2e9aef40e5e838d2654298e281ad3ec98af3)
    (cherry picked from commit d28ba1d46c226c8c611816393cdf8eba393300f5)

commit 4559441464b81c6a1582af376a5379025e369b44
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 28 18:11:33 2010 -0800

    Fix bug #7892 - open_file_fchmod() leaves a stale lock.
    (cherry picked from commit 023aa6f4aae29ba22b3d42c815027ba6a66f8ee2)

commit 133b474c6d8cc0191148f3a00cab878784aaf9bd
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 21 21:55:01 2010 +0100

    s3: Use smbsock_any_connect in winbind
    
    The last 8 patches address bug #7881 (winbind flaky against w2k8).
    (cherry picked from commit 1a929d8f4c6bae302e5cc53d81117a05eae5fede)

commit efa34c00c5258ba5d06e3915a16681ebad005ce8
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 21 18:52:53 2010 +0100

    s3: Retry *SMBSERVER in nb_connect
    (cherry picked from commit ee2534c18b5afa609ff17d9da7ea10bcf7654fc6)

commit 03e02ad573bcf92e191fa082b44f85cda95084a6
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Dec 13 17:17:51 2010 +0100

    s3: Add smbsock_any_connect
    (cherry picked from commit 198b6d673787ee40c0ac389ece99cee1844dd585)

commit 607c00d9aff86a88afad1e5929fbc70414472814
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Dec 12 18:55:06 2010 +0100

    s3: Add an async smbsock_connect
    
    This connects to 445 and after 5 milliseconds also to 139. It treats a netbios
    session setup failure as equivalent as a TCP connect failure. So if 139 is
    faster but fails the nb session setup, the 445 still has the chance to succeed.
    (cherry picked from commit 35bbc2231760badaf0debc9f8f39ebdf00cfe8ad)

commit 14e272c5022cb74b47d1e6021c8d919e3b354342
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Dec 22 15:21:27 2010 +0100

    v3-4-test: Pull in tevent_req_poll_ntstatus from master
    (cherry picked from commit 9b79de1553cfa57d24d1ac0316b814933ef3d33d)

commit 88ce2c71e36b0e556dfbd74f6c8c4de7034b2075
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Dec 12 18:54:31 2010 +0100

    s3: Add async cli_session_request
    
    This does not do the redirects, but I think that might be obsolete anyway
    (cherry picked from commit e2296e23a8546e249d1b26f4da6277792923bef4)

commit b2a1f5ad92bdbdea14087af007412946d6955474
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Dec 22 15:15:47 2010 +0100

    v3-4-test: Pull in read_smb_send from master
    (cherry picked from commit 02c4649674d3bd0f54e71910f11d6aff2cdb6c9d)

commit f338111ab0f6024d8b68a8e9ad8ae2037bb9f987
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Dec 12 18:53:49 2010 +0100

    s3: Add some const to name_mangle()
    (cherry picked from commit 56c760ab41b9b4cb9680d873b8f9955be21434f4)

commit 7943955d37a74b207f3cbcfd3bb37645b9ac9465
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Nov 17 08:56:28 2010 -0700

    s3: Make winbind recover from a signing error
    
    When winbind sees a signing error on the smb connection to a DC (for whatever
    reason, our bug, network glitch, etc) it should recover properly. The "old"
    code in clientgen.c just closed the socket in this case. This is the right
    thing to do, this connection is spoiled anyway. The new, async code did not do
    this so far, which led to the code in winbindd_cm.c not detect that we need to
    reconnect.
    
    Fix bug #7800 (winbind does not recover from smb signing errors).
    (cherry picked from commit 8c2493ff2e646928035ec7296f4451f09390f6aa)

commit fc80176d53a35c5e0d188c82f3cc301106c87671
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 2 17:07:00 2010 +0200

    s3: Stop using the write cache after an oplock break
    
    Fix bug #7715 (Setting Samba Write Cache Size Can Cause File Corruption).
    (cherry picked from commit 9f8292e5f765dff586bfbb261b54da4d4b27a837)
    (cherry picked from commit e18ef6cdf042a73e7f08b792e4a9901b071b1f67)

commit e3e35faada0c5baa40d4b3b67341cb30a66233cd
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Aug 23 16:30:53 2010 -0700

    Fix bug 7636 - winbind internal error, backtrace.
    
    Jeremy.
    (cherry picked from commit 995e7e500327e662b7ef2b37c83c92e75f2360bf)

commit 8863dce17e0e107efaa1bd8fe8edbd44b88faad5
Author: Jim McDonough <jmcd at samba.org>
Date:   Mon Aug 23 11:14:47 2010 +0200

    s3-printing: fix BUG 7280 - auto printers not loading with registry config
    (cherry picked from commit 9c3537b6d8b2ea36265d3a69f7e90278cb86dbfb)

commit bd20f12ae607751e7c0ceed197c8a290876a5d93
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 27 01:54:01 2010 -0700

    Fix bug 7590 - offline login fails because winbind deletes cache on every startup.
    
    Sync lib/tdb_validate.c with the change in current master.
    Change tdb_validate_open() to always use O_RDWR instead of O_RDONLY,
    as (from the bug report): "db_check() will always return failure for a read-only database.
    Silently, without any log output, when _tdb_lockall() fails."
    
    Jeremy.
    (cherry picked from commit 39cb903463d8a3fcabd9e148112bf5cf81744130)
    (cherry picked from commit 9812b1a601c9ccc2a3e6c06b98c32730a32c787a)

commit 97f779df539808cb2b08cbfb2f39f4e375bcd9ac
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 9 11:26:03 2010 +0200

    rerun: make samba3-idl
    
    metze
    (cherry picked from commit 9b9b46252ecf426467205908cb7ba487b7774b5b)

commit 00c0580d30f487aacad89c909a54945c46cb36d3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 9 11:14:52 2010 +0200

    pidl: Samba3/ClientNDR - Correctly copy arrays, if r.out.size < r.in.size.
    
    metze
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    (similar to commit 33d1879d5b50e2d98c1bb13b835e7cfb178e3336)
    (similar to commit d1e92cd2944983ecabd0511ff7c8221c1033a3a8)
    Fixes bug #7607.
    (cherry picked from commit d04e5c4d0ae4bb20497748771aa1467cc14f2265)

commit 6dc20e50d0bbd122e47b67bac74a9e6d4af60aea
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Aug 12 14:24:01 2010 -0700

    Fix bug #7617 - smbd coredump due to uninitialized variables in the performance counter code.
    
    In the file rpc_server.c, function _winreg_QueryValue()
    
    uint8_t *outbuf
    
    Should be :
    
    uint8_t *outbuf = NULL;
    
    As it is later freed by
    
          if (free_buf) SAFE_FREE(outbuf);
    
    in some cases, this frees the unintialized outbuf, which causes a coredump.
    (cherry picked from commit 84fd910c347ddfad6f01edbe7f6e25546c8382ee)
    (cherry picked from commit 80e65236158d6f1690bf9f153c0eb12d81d56b8a)
    (cherry picked from commit 78d1a15920de4ef3f230511257ee2f334f89a642)

commit 4447ae9ccd9091776cd2fbed955e856073f253eb
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 9 14:31:24 2010 +0200

    s3-winbind: Fix Bug #7568: Make sure cm_connect_lsa_tcp does not reset the secure channel.
    
    This is an important fix as the following could and is happening:
    
    * winbind authenticates a user via schannel secured netlogon samlogonex call,
    current secure channel cred state is stored in winbind state, winbind
    sucessfully decrypts session key from the info3
    
    * winbind sets up a new schannel ncacn_ip_tcp lsa pipe (and thereby resets the
    secure channel on the dc)
    
    * subsequent samlogonex calls use the new secure channel creds on the dc to
    encrypt info3 session key, while winbind tries to use old schannel creds for
    decryption
    
    Guenther
    (cherry picked from commit be396411a4e1f3a174f8a44b6c062d834135e70a)
    (cherry picked from commit e647f5b5409502ec329e24f09202b036cfb357ae)

commit 0c10994635b9f19154c2df7d9db9728cf5157b81
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 27 08:47:14 2010 +0200

    s3-libsmb: Fix bug #7577.
    
    SPNEGO auth fails when contacting Win7 system using Microsoft Live Sign-in
    Assistant.
    (cherry picked from commit 8564193ca6e023574764676088cafb7215f796f5)

commit 2a1568f81ba488f6e7d3a90ac6fbab30578e2041
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Dec 10 11:22:20 2009 +1100

    librpc: split out a separate GUID_from_ndr_blob() function
    
    This will simplify many of the places that deal with NDR formatted
    GUIDs
    (cherry picked from commit effff544265c63c95cf630d426b630bfe4d25aec)
    
    This patch is part of a fix for bug #7538 (Backport fixes for
    GUID_from_data_blob).
    (cherry picked from commit e8ed2b596627e8704e3384d5997020059b47144a)
    (cherry picked from commit 82d609cefbb6177738fd78ca017d4196b80a0718)

commit d3a6a079c0bde67ccc1cbe4d20210f2077fc4f19
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jul 4 10:01:42 2010 +0200

    s3: Fix bug 7336: Enable idmap_passdb module build as shared
    (cherry picked from commit 8c0fbc410798512b7a4b7db73bcb24cde6fa7849)
    (cherry picked from commit b4803af11525823ea508d0ca4e58402d55901194)
    (cherry picked from commit 1b22e942aa869d51dc9e50b74c44ece004c30947)

commit a5fff7220d29446fa0fd020a2798349ad04a6b8b
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Jun 28 21:00:30 2010 +0200

    s3-librpc: Fixed GUID_from_data_blob() with length of 32.
    
    If we hit the case that the blob length is 32. The code goes to the end
    of the function and generates a GUID with garbage.
    So try to convert the blob to the GUID and return.
    
    Fix bug #7538 (Backport fixes for GUID_from_data_blob).
    (cherry picked from commit 3c4353d2aa15db278bb87c949cce2deb3a5072ca)
    (cherry picked from commit 10e34cff5588b0d6434a093b3ecf90e6ccc1796a)

commit f2804944ad626775cbe5f4c97011b50b0dd31004
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jul 1 13:58:56 2010 +0200

    s3-printing: Fix Bug #7541, %D in "printer admin" causing smbd crash.
    
    Guenther
    (cherry picked from commit 094e8643e50c382a0703fb87b1ad469323d0b89e)

commit bf6dbcced9a9512eaf5c4909e532c25dfdadb397
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jun 21 10:30:25 2010 +0200

    s3-docs: Add missing whitespace.
    
    Karolin
    (cherry picked from commit 2352538362977e456e8d05783f2732ff650cea41)
    (cherry picked from commit 9d9a9a0f79ad6fa894f72a4678f59fb40c9fce94)
    (cherry picked from commit fb5b75d26b882c48ac073b6425dfce15873c243e)
    (cherry picked from commit 7321f35854503dc5395765d86e60b151986a0be3)

commit 4297ef95cd99c245cea0c6afd5cbf61f26788085
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jun 16 17:08:36 2010 +0200

    s3-docs: Fix some of ntlm_auth ntlm-server-1 protocol documentation.
    
    Guenther
    (cherry picked from commit cfb67b1a169350a8316532eb5d53de4a3f2bacb3)
    (cherry picked from commit b3ccbcb83650cea627ad97e920d3f73659ffa6a0)
    (cherry picked from commit 2e36a64cc9920db2b79b6c53dd355c7af8e60ab0)

commit 1fc9f1489507058ae351ba68d7963db0dd0e6cd3
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 10 15:40:14 2010 +0200

    s3: Fix EnumDomainAliases when no aliases are in LDAP
    
    We used to return NT_STATUS_ACCESS_DENIED, now we just return 0 entries, just
    like W2k8 does.
    
    usrmgr.exe was pretty unhappy with the NT_STATUS_ACCESS_DENIED
    (cherry picked from commit f66cc827096c53d4d16b8c850c83a3b5664e9725)
    
    Fix bug #7262 (Unable to maintain users' groups via UsrMgr).
    (cherry picked from commit 1439a1d7ff406dd5dce885100349751151c14bf6)
    (cherry picked from commit bd6a48e687636d5d9489129faff00e45d50d0d31)

commit 3633fad4422a1e9f5852bd552a2fb62a444fbd21
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jun 10 11:56:15 2010 +0200

    s3:pdb_ldap: fix bug 7507 - init_sam_from_ldap stores group in sid2uid cache
    (cherry picked from commit ba809ecb8ab217e4376bf75d2300e146b62b88eb)
    (cherry picked from commit cc740fb5eb56a0875703753d4a116d2fe33ec186)
    (cherry picked from commit b206d75ca5ba04a866a22dfca5b7441fb49078d8)

commit da6259be54edaf86bb44a343b365c9def8135de5
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 8 11:25:00 2010 +0200

    s3-netdomjoin-gui: Fix Bug #7500. Fix 'not a string literal' warning in netdomjoin-gui.
    
    Patch from Buchan Milne <bgmilne at mandriva.org>.
    
    Thanks!
    
    Guenther
    (cherry picked from commit 575b1018c65312e9eab562cf4851524cf2f8f24a)
    (cherry picked from commit 1419c154d67b8ffaf0d6e2e3ba103121ab3736f5)
    (cherry picked from commit 5fbf50d351bf3d14b495a5aa586b0cee68ab0cae)

commit 81f4c22bc4225e098541787de6b714a1bb2ef63b
Author: Günther Deschner <gd at samba.org>
Date:   Sat May 15 00:34:35 2010 +0200

    s3-kerberos: temporary fix for ipv6 in print_kdc_line().
    
    Currently no krb5 lib supports "kdc = ipv6 address" at all, so for now just fill
    in just the kdc_name if we have it and let the krb5 lib figure out the
    appropriate ipv6 address
    
    ipv6 gurus, please check.
    
    Guenther
    (cherry picked from commit dd5a4e23f8c24564d3fd21bb8d01172321087362)
    
    The last 3 patches fix bug #7341 (winbind not working over IPv6).
    (cherry picked from commit 22de0639efe63def87e32e5c18a82ea56c2984ef)

commit 80ad2c9bdf4324b58439a5801a0accec7064dd88
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 14 23:23:34 2010 +0200

    s3-kerberos: pass down kdc_name to create_local_private_krb5_conf_for_domain().
    
    Guenther
    (cherry picked from commit e3bdff3d67b46277ee59685218bd90f3788b487d)
    (cherry picked from commit 69e1fc797dc34be03d771ec017ef27c6aa87a155)

commit 1f3cea4a200fc400fedb551a92c87f59d581b003
Author: Günther Deschner <gd at samba.org>
Date:   Fri May 14 23:21:47 2010 +0200

    s3-winbind: make the getpeername() checks in cm_prepare_connection IPv6 aware.
    
    Note that this failure was hard to track, as winbind did only log a super helpful
    "cm_prepare_connection: Success" debug message.
    
    IPv6 gurus, please check
    
    Successfully tested in two independent IPv6 networks now.
    
    Guenther
    (cherry picked from commit 14ac2bb36ee22be6133ca1d069dc5de6c1891f47)
    (cherry picked from commit 43e4323d4a009c2b18be090f183dfd8c9f561fed)

commit 4d084a825df3173e379a249a5ffd6bf791dc37c2
Author: Andreas Schneider <asn at samba.org>
Date:   Wed May 12 18:36:30 2010 +0200

    s3-spoolss: Added EN ISO 216, A0 and A1 to builtin forms.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Signed-off-by: Günther Deschner <gd at samba.org>
    (cherry picked from commit 0953087f82ddbd580e9807e0e8d780e78686c03c)
    
    Fix bug #7423 (Large Formats at printing not available).
    (cherry picked from commit 6d851e16cf67832ad1749a63ec69faf865d9ed45)

commit 450c5be5e005efb49f05410bfefeb0e27f07bf8f
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed May 12 11:24:57 2010 +0200

    s3-docs: Move -D option to the right paragraph in man winbindd.
    
    Fix bug #7260 (Command line option documentation in wrong place in winbindd man
    page.). Thanks to Ged Haywood <samba at jubileegroup.co.uk> for reporting!
    
    Karolin
    (cherry picked from commit da5c49d727150eea7d2a4b83da1a02ac1f26e77c)
    (cherry picked from commit b737434fbf60c250166f10cf196af8030b388bdb)
    (cherry picked from commit 1afa6b56da01bef9d8fcca3f8278c42378c0a21d)

commit 5c2b44d98a20d2b9786575ea40d79821dae9b718
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date:   Tue May 11 11:30:04 2010 +0200

    work around AIX6.1 name space pollution rename mod_name to module_name
    
    Fix bug #7421 (samba 3.4.7 does not compile on AIX 6.1).
    (cherry picked from commit 231760282dcb1232019f62025e1e5918a940bb5b)

commit 10d8bc3bbd26d57366dab9726d7ecc074b431c2f
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 18 12:40:00 2010 +0100

    s3-spoolss: Fix _spoolss_EnumPrinters servername handling.
    
    Guenther
    (cherry picked from commit b3c2b2260a503079b9abf22f6b35b56c61c2b372)
    
    The last two patches address bug #7418 ("net rpc printer list" command is
    inoperative).
    (cherry picked from commit df5f448fe371a1227a507cedc2642fa1a4b77e65)
    (cherry picked from commit df75d920edaad2ef113fe6c46b3e9b36fa0930a8)

commit 6022a74ed3bc06af8b1564af4c9d1158ff2191f8
Author: Günther Deschner <gd at samba.org>
Date:   Thu Feb 18 02:03:53 2010 +0100

    s3-spoolss: in spoolss_EnumPrinters r->in.server is a *unique* pointer!
    
    Guenther
    (cherry picked from commit 8ce66fba03f782c0b9948a9835bb488cfa74acf9)
    (cherry picked from commit cb6fcb9b16b36fcdc68bef382dbd7ecf89521d4e)
    (cherry picked from commit bd76c22f4c7ab39b79f5cf381d39bff1b974363f)

commit 3fc63a6ce53e3fce0f1df6f20365b099067b1867
Author: Günther Deschner <gd at samba.org>
Date:   Sat May 8 02:16:37 2010 +0200

    s3-net: Fix Bug #7417. 'net rpc user password' can set the wrong password.
    
    Guenther
    (cherry picked from commit 7887d99a60387e93ce5ce4a3bfe9117939d1e4c8)
    (cherry picked from commit fb4d896217183b0ea2b97016aa84c2d83f7f1323)

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

Summary of changes:
 WHATSNEW.txt                                       |  113 ++++-
 docs-xml/manpages-3/ntlm_auth.1.xml                |    6 +-
 docs-xml/manpages-3/winbindd.8.xml                 |   20 +-
 docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml |    2 +-
 librpc/gen_ndr/cli_epmapper.c                      |   10 +-
 librpc/gen_ndr/cli_ntsvcs.c                        |   10 +-
 librpc/gen_ndr/cli_winreg.c                        |   21 +-
 librpc/ndr/libndr.h                                |    1 +
 librpc/ndr/uuid.c                                  |   44 +-
 pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm            |   38 ++-
 source3/Makefile.in                                |    5 +
 source3/VERSION                                    |    2 +-
 source3/auth/auth_util.c                           |    6 +-
 source3/configure.in                               |    4 +-
 source3/include/async_smb.h                        |    7 +
 source3/include/proto.h                            |   33 +-
 .../examples/netdomjoin-gui/netdomjoin-gui.c       |    2 +-
 source3/lib/netapi/user.c                          |    3 -
 source3/lib/tdb_validate.c                         |    2 +-
 source3/lib/util.c                                 |   11 +
 source3/libaddns/dnsgss.c                          |    4 +-
 source3/libads/kerberos.c                          |   44 ++-
 source3/libnet/libnet_samsync_ldif.c               |   16 +-
 source3/libsmb/async_smb.c                         |  214 ++++++++
 source3/libsmb/clispnego.c                         |   44 ++-
 source3/libsmb/namequery_dc.c                      |    6 +-
 source3/libsmb/nmblib.c                            |    2 +-
 source3/libsmb/smbsock_connect.c                   |  573 ++++++++++++++++++++
 source3/nmbd/nmbd.c                                |    4 +-
 source3/passdb/pdb_ldap.c                          |   12 +-
 source3/printing/load.c                            |    4 +
 source3/printing/nt_printing.c                     |    6 +-
 source3/rpc_server/srv_spoolss_nt.c                |   30 +-
 source3/rpc_server/srv_winreg_nt.c                 |    4 +-
 source3/rpcclient/cmd_spoolss.c                    |    6 +-
 source3/smbd/dosmode.c                             |   11 +-
 source3/smbd/open.c                                |   40 +--
 source3/smbd/oplock.c                              |    1 +
 source3/smbd/posix_acls.c                          |    4 +-
 source3/utils/net_rpc.c                            |    5 +-
 source3/winbindd/winbindd_cm.c                     |  109 ++--
 source4/lib/com/tables.c                           |    6 +-
 42 files changed, 1268 insertions(+), 217 deletions(-)
 create mode 100644 source3/libsmb/smbsock_connect.c


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 5b25be3..6023e8c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,3 +1,112 @@
+                   ==============================
+                   Release Notes for Samba 3.4.10
+			  January 22, 2011
+                   ==============================
+
+
+This is the latest stable release of Samba 3.4.
+
+Major enhancements in Samba 3.4.10 include:
+
+   o Fix smbd coredump (bug #7617).
+   o Fix Winbind internal error (bug #7636).
+   o Fix flaky Winbind against w2k8 (bug #7881).
+
+
+Changes since 3.4.9
+-------------------
+
+o   Michael Adam <obnox at samba.org>
+    * BUG 7507: init_sam_from_ldap stores group in sid2uid cache.
+
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 7577: Fix SPNEGO auth when contacting Win7 system using Microsoft Live
+      Sign-in Assistant.
+    * BUG 7590: Fix offline login in Winbind.
+    * BUG 7617: Fix smbd coredump.
+    * BUG 7636: Fix Winbind internal error.
+    * BUG 7892: Fix stale lock in open_file_fchmod().
+
+
+o   Andrew Bartlett <abartlet at samba.org>
+    * BUG 7356: Fix 'net ads dns register' in Win 2008 R2 domains.
+
+
+o   Björn Baumbach <bb at sernet.de>
+    * BUG 7875: Fix 'nmbd --port'.
+    * BUG 7880: Make 'rpcclient deldriver' delete drivers for all architectures.
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 7341: Fix Winbind over IPv6.
+    * BUG 7417: Fix 'net rpc user password' command.
+    * BUG 7418: Fix 'net rpc printer list' command.
+    * BUG 7500: Fix 'not a string literal' warning in netdomjoin-gui.
+    * BUG 7541: Fix smbd crash caused by "%D" in "printer admin" option.
+    * BUG 7568: Make sure cm_connect_lsa_tcp does not reset the secure channel.
+
+
+o   Olaf Flebbe <o.flebbe at science-computing.de>
+    * BUG 7421: Fix build on AIX 6.1.
+
+
+o   Björn Jacke <bj at sernet.de>
+    * BUG 7821: Set Tru64 cc's PIC switch right.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 7066: Fix "Your Password expires today" message for users from trusted
+      domains.
+    * BUG 7262: Fix EnumDomainAliases when no aliases are in LDAP.
+    * BUG 7336: Enable idmap_passdb module build as shared.
+    * BUG 7715: Stop using the write cache after an oplock break: Stop using the
+      write cache after an oplock break.
+    * BUG 7800: Make winbind recover from a signing error.
+    * BUG 7881: Fix flaky Winbind against w2k8.
+
+
+o   Jim McDonough <jmcd at samba.org>
+    * BUG 7280: Fix loading of auto printers with registry config.
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * BUG 7607: Fix buffer over-read in pidl generated client code.
+    * BUG 7896: Fix 'net rpc user rename'.
+
+
+o   Andreas Schneider <asn at samba.org>
+    * BUG 7423: Add EN ISO 216, A0 and A1 to builtin forms.
+    * BUG 7538: Backport fixes for GUID_from_data_blob.
+
+
+o   Andrew Tridgell <tridge at samba.org>
+    * BUG 7538: Backport fixes for GUID_from_data_blob.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.4 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older versions follow:
+----------------------------------------
+
                    =============================
                    Release Notes for Samba 3.4.9
 			 September 14, 2010
@@ -50,8 +159,8 @@ database (https://bugzilla.samba.org/).
 ======================================================================
 
 
-Release notes for older versions follow:
-----------------------------------------
+----------------------------------------------------------------------
+
 
                    =============================
                    Release Notes for Samba 3.4.8
diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index edd1e11..0ce9825 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -171,13 +171,13 @@
 		    </listitem></varlistentry>
 
 		  <varlistentry>
-		  <term>Username</term>
+		  <term>NT-Domain</term>
                 <listitem><para>The user's domain, expected to be in
                 Samba's <smbconfoption name="unix charset"/>.
                 </para>
 
-		      <para><example>Domain: WORKGROUP</example></para>
-		      <para><example>Domain:: V09SS0dST1VQ</example></para>
+		      <para><example>NT-Domain: WORKGROUP</example></para>
+		      <para><example>NT-Domain:: V09SS0dST1VQ</example></para>
 		    </listitem></varlistentry>
 
 		  <varlistentry>
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index b1e3465..0988ed4 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -80,16 +80,6 @@
 
 	<variablelist>
 		<varlistentry>
-		<term>-D</term>
-		<listitem><para>If specified, this parameter causes
-		the server to operate as a daemon. That is, it detaches
-		itself and runs in the background on the appropriate port. 
-		This switch is assumed if <command>winbindd</command> is 
-		executed on the command line of a shell.
-		</para></listitem>
-		</varlistentry>
-
-		<varlistentry>
 		<term>hosts</term>
 		<listitem><para>This feature is only available on IRIX.
 		User information traditionally stored in
@@ -147,6 +137,16 @@ hosts:		files wins
 
 	<variablelist>
 		<varlistentry>
+		<term>-D</term>
+		<listitem><para>If specified, this parameter causes
+		the server to operate as a daemon. That is, it detaches
+		itself and runs in the background on the appropriate port.
+		This switch is assumed if <command>winbindd</command> is
+		executed on the command line of a shell.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
 		<term>-F</term>
 		<listitem><para>If specified, this parameter causes
 		the main <command>winbindd</command> process to not daemonize,
diff --git a/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml b/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
index c38ac3c..d0b4d7c 100644
--- a/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
+++ b/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
@@ -6,7 +6,7 @@
 <description>
     <para>
 	This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
-	<manvolnum>8</manvolnum></citerefentry>maps a POSIX ACE entry of "rwx" (read/write/execute), the maximum
+	<manvolnum>8</manvolnum></citerefentry> maps a POSIX ACE entry of "rwx" (read/write/execute), the maximum
 	allowed POSIX permission set, into a Windows ACL of "FULL CONTROL". If this parameter is set to true any POSIX
 	ACE entry of "rwx" will be returned in a Windows ACL as "FULL CONTROL", is this parameter is set to false any
 	POSIX ACE entry of "rwx" will be returned as the specific Windows ACL bits representing read, write and
diff --git a/librpc/gen_ndr/cli_epmapper.c b/librpc/gen_ndr/cli_epmapper.c
index 65621d3..eef9139 100644
--- a/librpc/gen_ndr/cli_epmapper.c
+++ b/librpc/gen_ndr/cli_epmapper.c
@@ -135,7 +135,10 @@ NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
 	/* Return variables */
 	*entry_handle = *r.out.entry_handle;
 	*num_ents = *r.out.num_ents;
-	memcpy(entries, r.out.entries, (r.in.max_ents) * sizeof(*entries));
+	if ((*r.out.num_ents) > (r.in.max_ents)) {
+		return NT_STATUS_INVALID_NETWORK_RESPONSE;
+	}
+	memcpy(entries, r.out.entries, (*r.out.num_ents) * sizeof(*entries));
 
 	/* Return result */
 	return NT_STATUS_OK;
@@ -184,7 +187,10 @@ NTSTATUS rpccli_epm_Map(struct rpc_pipe_client *cli,
 	/* Return variables */
 	*entry_handle = *r.out.entry_handle;
 	*num_towers = *r.out.num_towers;
-	memcpy(towers, r.out.towers, (r.in.max_towers) * sizeof(*towers));
+	if ((*r.out.num_towers) > (r.in.max_towers)) {
+		return NT_STATUS_INVALID_NETWORK_RESPONSE;
+	}
+	memcpy(towers, r.out.towers, (*r.out.num_towers) * sizeof(*towers));
 
 	/* Return result */
 	return NT_STATUS_OK;
diff --git a/librpc/gen_ndr/cli_ntsvcs.c b/librpc/gen_ndr/cli_ntsvcs.c
index 8f98278..e9c3d4c 100644
--- a/librpc/gen_ndr/cli_ntsvcs.c
+++ b/librpc/gen_ndr/cli_ntsvcs.c
@@ -461,7 +461,10 @@ NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
-	memcpy(buffer, r.out.buffer, (*r.in.length) * sizeof(*buffer));
+	if ((*r.out.length) > (*r.in.length)) {
+		return NT_STATUS_INVALID_NETWORK_RESPONSE;
+	}
+	memcpy(buffer, r.out.buffer, (*r.out.length) * sizeof(*buffer));
 	*length = *r.out.length;
 
 	/* Return result */
@@ -606,7 +609,10 @@ NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
 
 	/* Return variables */
 	*reg_data_type = *r.out.reg_data_type;
-	memcpy(buffer, r.out.buffer, (*r.in.buffer_size) * sizeof(*buffer));
+	if ((*r.out.buffer_size) > (*r.in.buffer_size)) {
+		return NT_STATUS_INVALID_NETWORK_RESPONSE;
+	}
+	memcpy(buffer, r.out.buffer, (*r.out.buffer_size) * sizeof(*buffer));
 	*buffer_size = *r.out.buffer_size;
 	*needed = *r.out.needed;
 
diff --git a/librpc/gen_ndr/cli_winreg.c b/librpc/gen_ndr/cli_winreg.c
index c5d19be..93f969d 100644
--- a/librpc/gen_ndr/cli_winreg.c
+++ b/librpc/gen_ndr/cli_winreg.c
@@ -544,7 +544,13 @@ NTSTATUS rpccli_winreg_EnumValue(struct rpc_pipe_client *cli,
 		*type = *r.out.type;
 	}
 	if (value && r.out.value) {
-		memcpy(value, r.out.value, (*r.in.size) * sizeof(*value));
+		if ((*r.out.size) > (*r.in.size)) {
+			return NT_STATUS_INVALID_NETWORK_RESPONSE;
+		}
+		if ((*r.out.length) > (*r.out.size)) {
+			return NT_STATUS_INVALID_NETWORK_RESPONSE;
+		}
+		memcpy(value, r.out.value, (*r.out.length) * sizeof(*value));
 	}
 	if (size && r.out.size) {
 		*size = *r.out.size;
@@ -915,7 +921,13 @@ NTSTATUS rpccli_winreg_QueryValue(struct rpc_pipe_client *cli,
 		*type = *r.out.type;
 	}
 	if (data && r.out.data) {
-		memcpy(data, r.out.data, (*r.in.data_size) * sizeof(*data));
+		if ((*r.out.data_size) > (*r.in.data_size)) {
+			return NT_STATUS_INVALID_NETWORK_RESPONSE;
+		}
+		if ((*r.out.data_length) > (*r.out.data_size)) {
+			return NT_STATUS_INVALID_NETWORK_RESPONSE;
+		}
+		memcpy(data, r.out.data, (*r.out.data_length) * sizeof(*data));
 	}
 	if (data_size && r.out.data_size) {
 		*data_size = *r.out.data_size;
@@ -1483,7 +1495,10 @@ NTSTATUS rpccli_winreg_QueryMultipleValues(struct rpc_pipe_client *cli,
 	/* Return variables */
 	memcpy(values, r.out.values, (r.in.num_values) * sizeof(*values));
 	if (buffer && r.out.buffer) {
-		memcpy(buffer, r.out.buffer, (*r.in.buffer_size) * sizeof(*buffer));
+		if ((*r.out.buffer_size) > (*r.in.buffer_size)) {
+			return NT_STATUS_INVALID_NETWORK_RESPONSE;
+		}
+		memcpy(buffer, r.out.buffer, (*r.out.buffer_size) * sizeof(*buffer));
 	}
 	*buffer_size = *r.out.buffer_size;
 
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index f730ed8..e1bcdb9 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -522,6 +522,7 @@ enum ndr_err_code ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const ch
 
 /* GUIDs */
 bool GUID_equal(const struct GUID *u1, const struct GUID *u2);
+NTSTATUS GUID_from_ndr_blob(const DATA_BLOB *b, struct GUID *guid);
 NTSTATUS GUID_from_data_blob(const DATA_BLOB *s, struct GUID *guid);
 NTSTATUS GUID_from_string(const char *s, struct GUID *guid);
 NTSTATUS NS_GUID_from_string(const char *s, struct GUID *guid);
diff --git a/librpc/ndr/uuid.c b/librpc/ndr/uuid.c
index 2b47246..9289712 100644
--- a/librpc/ndr/uuid.c
+++ b/librpc/ndr/uuid.c
@@ -25,6 +25,25 @@
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 
+
+/**
+  build a GUID from a NDR data blob
+*/
+_PUBLIC_ NTSTATUS GUID_from_ndr_blob(const DATA_BLOB *b, struct GUID *guid)
+{
+	enum ndr_err_code ndr_err;
+	TALLOC_CTX *mem_ctx;
+
+	mem_ctx = talloc_new(NULL);
+	NT_STATUS_HAVE_NO_MEMORY(mem_ctx);
+
+	ndr_err = ndr_pull_struct_blob_all(b, mem_ctx, NULL, guid,
+					   (ndr_pull_flags_fn_t)ndr_pull_GUID);
+	talloc_free(mem_ctx);
+	return ndr_map_error2ntstatus(ndr_err);
+}
+
+
 /**
   build a GUID from a string
 */
@@ -81,29 +100,16 @@ _PUBLIC_ NTSTATUS GUID_from_data_blob(const DATA_BLOB *s, struct GUID *guid)
 	} else if (s->length == 32) {
 		size_t rlen = strhex_to_str((char *)blob16.data, blob16.length,
 					    (const char *)s->data, s->length);
-		if (rlen == blob16.length) {
-			/* goto the ndr_pull_struct_blob() path */
-			status = NT_STATUS_OK;
-			s = &blob16;
+		if (rlen != blob16.length) {
+			return NT_STATUS_INVALID_PARAMETER;
 		}
+
+		s = &blob16;
+		return GUID_from_ndr_blob(s, guid);
 	}
 
 	if (s->length == 16) {
-		enum ndr_err_code ndr_err;
-		struct GUID guid2;
-		TALLOC_CTX *mem_ctx;
-
-		mem_ctx = talloc_new(NULL);
-		NT_STATUS_HAVE_NO_MEMORY(mem_ctx);
-
-		ndr_err = ndr_pull_struct_blob(s, mem_ctx, NULL, &guid2,
-					       (ndr_pull_flags_fn_t)ndr_pull_GUID);
-		talloc_free(mem_ctx);
-		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-			return ndr_map_error2ntstatus(ndr_err);
-		}
-		*guid = guid2;
-		return NT_STATUS_OK;
+		return GUID_from_ndr_blob(s, guid);
 	}
 
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
index a45abdb..a5052e2 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
@@ -15,7 +15,7 @@ use strict;
 use Parse::Pidl qw(fatal warning error);
 use Parse::Pidl::Util qw(has_property ParseExpr);
 use Parse::Pidl::Samba4 qw(DeclLong);
-use Parse::Pidl::Samba4::Header qw(GenerateFunctionInEnv);
+use Parse::Pidl::Samba4::Header qw(GenerateFunctionInEnv GenerateFunctionOutEnv);
 
 use vars qw($VERSION);
 $VERSION = '0.01';
@@ -95,12 +95,38 @@ sub ParseOutputArgument($$$)
 		# Since the data is being copied into a user-provided data 
 		# structure, the user should be able to know the size beforehand 
 		# to allocate a structure of the right size.
-		my $env = GenerateFunctionInEnv($fn, "r.");
-		my $size_is = ParseExpr($e->{LEVELS}[$level]->{SIZE_IS}, $env, $e->{ORIGINAL});
-		if (has_property($e, "charset")) {
-		    $self->pidl("memcpy(discard_const_p(uint8_t *, $e->{NAME}), r.out.$e->{NAME}, ($size_is) * sizeof(*$e->{NAME}));");
+		my $in_env = GenerateFunctionInEnv($fn, "r.");
+		my $out_env = GenerateFunctionOutEnv($fn, "r.");
+		my $l = $e->{LEVELS}[$level];
+		unless (defined($l->{SIZE_IS})) {
+			$self->pidl('#error No size known for [out] array `$e->{NAME}');
+			error($e->{ORIGINAL}, "no size known for [out] array `$e->{NAME}'");
 		} else {
-		    $self->pidl("memcpy($e->{NAME}, r.out.$e->{NAME}, ($size_is) * sizeof(*$e->{NAME}));");
+			my $in_size_is = ParseExpr($l->{SIZE_IS}, $in_env, $e->{ORIGINAL});
+			my $out_size_is = ParseExpr($l->{SIZE_IS}, $out_env, $e->{ORIGINAL});
+			my $out_length_is = $out_size_is;
+			if (defined($l->{LENGTH_IS})) {
+				$out_length_is = ParseExpr($l->{LENGTH_IS}, $out_env, $e->{ORIGINAL});
+			}
+			if ($out_size_is ne $in_size_is) {
+				$self->pidl("if (($out_size_is) > ($in_size_is)) {");
+				$self->indent;
+				$self->pidl("return NT_STATUS_INVALID_NETWORK_RESPONSE;");
+				$self->deindent;
+				$self->pidl("}");
+			}
+			if ($out_length_is ne $out_size_is) {
+				$self->pidl("if (($out_length_is) > ($out_size_is)) {");
+				$self->indent;
+				$self->pidl("return NT_STATUS_INVALID_NETWORK_RESPONSE;");
+				$self->deindent;
+				$self->pidl("}");
+			}
+			if (has_property($e, "charset")) {
+				$self->pidl("memcpy(discard_const_p(uint8_t *, $e->{NAME}), r.out.$e->{NAME}, ($out_length_is) * sizeof(*$e->{NAME}));");
+			} else {
+				$self->pidl("memcpy($e->{NAME}, r.out.$e->{NAME}, ($out_length_is) * sizeof(*$e->{NAME}));");
+			}
 		}
 	} else {
 		$self->pidl("*$e->{NAME} = *r.out.$e->{NAME};");
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f1f8471..82e108a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -473,6 +473,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
              libsmb/credentials.o \
 	     libsmb/clioplock.o libsmb/clirap2.o \
 	     libsmb/smb_seal.o libsmb/async_smb.o \
+	     libsmb/smbsock_connect.o \
 	     $(LIBSAMBA_OBJ) \
 	     $(LIBNMB_OBJ) \
 	     $(LIBNBT_OBJ) \
@@ -2454,6 +2455,10 @@ bin/rid. at SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_rid.o
 	@echo "Building plugin $@"
 	@$(SHLD_MODULE) winbindd/idmap_rid.o
 
+bin/passdb. at SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_passdb.o
+	@echo "Building plugin $@"
+	@$(SHLD_MODULE) winbindd/idmap_passdb.o
+
 bin/ad. at SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_ad.o
 	@echo "Building plugin $@"
 	@$(SHLD_MODULE) winbindd/idmap_ad.o
diff --git a/source3/VERSION b/source3/VERSION
index da08a5c..ad6e361 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=4
-SAMBA_VERSION_RELEASE=9
+SAMBA_VERSION_RELEASE=10
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 89aa4a3..aafb6f2 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -2018,7 +2018,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
 
 	if (!pdb_set_pass_last_set_time(
 		    sam_account,
-		    nt_time_to_unix(info->pass_last_set_time),
+		    info->pass_last_set_time,
 		    PDB_CHANGED)) {
 		TALLOC_FREE(result);
 		return NT_STATUS_NO_MEMORY;
@@ -2026,7 +2026,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
 
 	if (!pdb_set_pass_can_change_time(
 		    sam_account,
-		    nt_time_to_unix(info->pass_can_change_time),
+		    info->pass_can_change_time,
 		    PDB_CHANGED)) {
 		TALLOC_FREE(result);
 		return NT_STATUS_NO_MEMORY;
@@ -2034,7 +2034,7 @@ NTSTATUS make_server_info_wbcAuthUserInfo(TALLOC_CTX *mem_ctx,
 
 	if (!pdb_set_pass_must_change_time(
 		    sam_account,
-		    nt_time_to_unix(info->pass_must_change_time),


-- 
Samba Shared Repository


More information about the samba-cvs mailing list