[SCM] Samba Shared Repository - branch v4-2-test updated

Karolin Seeger kseeger at samba.org
Tue Mar 24 00:15:06 MDT 2015


The branch, v4-2-test has been updated
       via  84782d4 replace: Remove superfluous check for gcrypt header.
       via  b8253f2 backupkey: Explicitly link to gnutls and gcrypt
       via  2ee70a1 lib/tls: Fix behaviour of --disable-gnutls and remove link to gcrypt
       via  1f4edb0 s3: lib: libsmbclient: If reusing a server struct, check every cli->timout miliseconds if it's still valid before use.
       via  a5156c6 s3: libcli: smb1: Ensure we correctly finish a tevent req if the writev fails in the SMB1 case.
       via  6b4a52c s3: lib: ntlmssp: If NTLMSSP_NEGOTIATE_TARGET_INFO isn't set, cope with servers that don't send the 2 unused fields.
       via  6f262f6 s4: lib: auth: If NTLMSSP_NEGOTIATE_TARGET_INFO isn't set, cope with servers that don't send the 2 unused fields.
       via  e1bf5b7 docs/idmap_rid: remove deprecated base_rid from example
       via  1346811 libcli/auth: Match Declaration of netlogon_creds_cli_context_tmp with implementation
       via  7b7602c Update libwbclient version to 0.12
       via  fe5ac73 Move wbc global variables into global context instead
       via  bb70e50 Add context versions of wbclient functions
       via  b9d75f6 Add wbcContext to wbcRequestResponse
       via  a52f418 Add wbcContext struct, create and free functions
       via  ae434f4 Use global context for winbindd_request_response
       via  7f787b4 Make winbind client library thread-safe by adding context
       via  f56d56e talloc: version 2.1.2
       via  0693e46 talloc: fix _talloc_total_limit_size prototype
       via  f6df1e9 lib: talloc: Test suite for the new destructor reparent logic.
       via  a21e4e2 lib: talloc: Allow destructors to reparent the object they're called on.
       via  599ca10 lib: talloc: Fix bug when calling a destructor.
       via  bb97c5e s3-winbind: Fix chached user group lookup of trusted domains.
       via  e92a548 Be consistent about what functions add $LISTOPT and $LOADLIST to the command-line.
       via  ebcba7a selftest: Add separate command line for listing tests, allowing us of subunit-filter (which doesn't support subunit v2).
       via  d8aafcd selftest/tests.py: Remove testsuite samba.tests.samdb which does not have any tests.
       via  b953fbd Re-use add_prefix function.
       via  df04a81 selftest: Drop support for TESTSUITE-IDLIST, and remove its last user.
       via  6bf5d33 sam: Use samba.tests.subunitrun.
       via  f847bb0 Use samba.tests.subunitrun in dsdb ldap and ldap_schema tests.
       via  84547fa Use samba.tests.subunitrun in urgent replication test.
       via  502f424 Include mimeparse, which is used by subunit/testtools.
       via  c845ccb ldap: Use samba.tests.subunitrun.
       via  fbf9611 deletetest: use samba.tests.subunitrun.
       via  6fbfee3 ldap_syntaxes: Use samba.tests.subunitrun.
       via  2494914 password lockout: Use samba.tests.subunitrun.
       via  0bd1fde passwords: Use samba.tests.subunitrun.
       via  fb37077 sec_descriptor: Use samba.tests.subunitrun.
       via  17f62c0 token_group: Use samba.tests.subunitrun.
       via  c42d07e sites: Use samba.tests.subunitrun.
       via  84d21d8 speedtest: Use samba.tests.subunitrun.
       via  c41dfc5 credentials test: Use samba.tests.subunitrun.
       via  8f76884 sec_descriptor test: Simplify, use samba.tests.subunitrun module.
       via  368e50f Move option handling into samba.tests.subunitrun.
       via  247974b Move option parsing to samba.tests.subunitrun.
       via  2969bbe subunitrun: Use new samba.tests.subunitrun module.
       via  4e1e255 Add convenience class for old-style Samba subunit python tests.
       via  5ef9651 Add bundled copy of 'extras' python module used by newer versions of testtools/subunit.
       via  48a92dd filter-subunit: Consistently use spaces rather than tabs.
       via  88b864a Support using system ldbmodify.
       via  daa54fd Fix subunit test suite name.
       via  d9c4441 dsdb.tests.acl: Create and run a single testsuite, should easy migration to regulary Python unit tests.
       via  df1e7b9 dsdb.tests.ldap: Create and run a single testsuite, should easy migration to regulary Python unit tests.
       via  27c6ebf speedtest: Create and run a single testsuite, should easy migration to regulary Python unit tests.
       via  b01799a dirsync test: Create and run a single testsuite, should easy migration to regulary Python unit tests.
       via  b6c9783 filter-subunit: Drop support for allow_empty_output hack.
       via  a72824b samba3dump: Add subunit-enabled test for samba3dump.
       via  7af1da1 urgent_replication: Use subunit reporting, remove allow_empty_output.
       via  defd8b3 Remove unused imports.
       via  9e69843 spoolss: retrieve published printer GUID if not in registry
       via  f296297 printing: rework nt_printer_guid_store to return errors
       via  df9b1ca printing: add nt_printer_guid_retrieve() helper
       via  5c1b979 printing: split out printer DN and GUID retrieval
       via  7c48f53 brlock: Use 0 instead of empty initializer list
      from  6eaa807 lib: texpect. Fix the build on Solaris.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test


- Log -----------------------------------------------------------------
commit 84782d42c77b41d9560b2920d0a680c44a6e6e91
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Mar 12 22:12:43 2015 +0100

    replace: Remove superfluous check for gcrypt header.
    
    We only need to check for the header if we need gnutls with gcrypt
    support.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11135
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Mar 13 01:00:27 CET 2015 on sn-devel-104
    
    (cherry picked from commit 07330d248bd3feb3c9748174dac407fca592638e)
    
    Autobuild-User(v4-2-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-2-test): Tue Mar 24 07:14:32 CET 2015 on sn-devel-104

commit b8253f2b55b56ade3b397dbdda9e7d55f9afa8fc
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Mar 12 17:05:50 2015 +1300

    backupkey: Explicitly link to gnutls and gcrypt
    
    The gcrypt link will be disabled if gnutls is > 3.0.0
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11135
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit 733435f8582adf7925ea0c93e2cdf411fb89624b)

commit 2ee70a19d0eb6141b35dc7a5f903746c0ed84641
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Mar 12 17:01:05 2015 +1300

    lib/tls: Fix behaviour of --disable-gnutls and remove link to gcrypt
    
    We no longer link against gcrypt if gnutls > 3.0.0 is found, as these
    versions use libnettle.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11135
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    (cherry picked from commit 61d962bdfdb9ca13e5f31e726ae84823c6f68fc6)

commit 1f4edb0f791c4da5f6c247a7f2ccc8eafbaf28d0
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Mar 18 14:15:16 2015 -0700

    s3: lib: libsmbclient: If reusing a server struct, check every cli->timout miliseconds if it's still valid before use.
    
    Uses an cli_echo() call to do so.
    
    Based on code from <shargagan at novell.com>
    
    Bug 11079 - libsmbclient not checking the cached connection alive status before re-using it from connection cache
    
    https://bugzilla.samba.org/show_bug.cgi?id=11079
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Fri Mar 20 13:48:26 CET 2015 on sn-devel-104
    
    (cherry picked from commit 4f4151ea050a5f34e42d73a4bf9448c673a35787)

commit a5156c61a200f687c80da2af3b1c3037665e3857
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 19 10:40:56 2015 -0700

    s3: libcli: smb1: Ensure we correctly finish a tevent req if the writev fails in the SMB1 case.
    
    We haven't added the req to the pending array yet, as SMB1 requests can
    be one-way (no reply needed). So if we error out after the writev, but
    before we add to the pending array we must rember to terminate our current
    tevent req with a tevent_req_nterror call.
    
    Fixes bug 11173 - SMB1 Server disconnect can cause timeout on client write error.
    
    https://bugzilla.samba.org/show_bug.cgi?id=11173
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Fri Mar 20 05:08:25 CET 2015 on sn-devel-104
    
    (cherry picked from commit 00d92f59257ce8fe1729becd72e13a42dfff0589)

commit 6b4a52c213a43760e7571b51f4bd2d8bd945c655
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Mar 9 14:27:43 2015 -0700

    s3: lib: ntlmssp: If NTLMSSP_NEGOTIATE_TARGET_INFO isn't set, cope with servers that don't send the 2 unused fields.
    
    Packet traces showing such servers are found in the bug this fixes:
    
    https://bugzilla.samba.org/show_bug.cgi?id=10016
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Thu Mar 19 12:05:56 CET 2015 on sn-devel-104
    
    (cherry picked from commit ffe33940faa6fb762fd2483f0245448b0434be00)

commit 6f262f698049d9027609159fc55b245be91c0395
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Mar 9 14:21:22 2015 -0700

    s4: lib: auth: If NTLMSSP_NEGOTIATE_TARGET_INFO isn't set, cope with servers that don't send the 2 unused fields.
    
    Packet traces showing such servers are found in the bug this fixes:
    
    https://bugzilla.samba.org/show_bug.cgi?id=10016
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 5137af570d8a173d7775754ad2e60d6d8efbe3a2)

commit e1bf5b737445a69d70e262ccdd97c0d499461895
Author: David Disseldorp <ddiss at samba.org>
Date:   Fri Jan 16 16:21:24 2015 +0100

    docs/idmap_rid: remove deprecated base_rid from example
    
    The base_rid option has been deprecated for some time. Specifying a
    value of 1000 (as recommended in the parameter description and example
    section) can result in failed mapping of group SIDs, where RIDs do not
    start at 1000.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=11169
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Mon Jan 19 09:09:22 CET 2015 on sn-devel-104
    
    (cherry picked from commit 8466587c589f01d59294be36ad0b347f5d82a11f)

commit 134681169f25dde6299196e43749bf7b87841ab3
Author: Thomas Schulz <schulz at adi.com>
Date:   Mon Mar 16 10:21:46 2015 -0700

    libcli/auth: Match Declaration of netlogon_creds_cli_context_tmp with implementation
    
    I have been building 4.2.0 with the GNU C compiler but I decided to see
    how it works with the Sun C 5.11 compiler. The Sun compiler complains
    about a identifier being redeclared in libcli/auth/netlogon_creds_cli.c
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11140
    
    Reviewed-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 820a0a91fbd341f3172b0d048a920cb2538bbd38)

commit 7b7602cc1430061ae596911e2cacab7a02a24b46
Author: Matthew Newton <matthew-git at newtoncomputing.co.uk>
Date:   Sun Mar 1 23:14:07 2015 +0000

    Update libwbclient version to 0.12
    
    Increment the minor version of the libwbclient library after new
    context functions added. (Major version increase not required as
    the only two functions with changed parameters are private to the
    library.)
    
    https://bugzilla.samba.org/show_bug.cgi?id=11149
    
    Signed-off-by: Matthew Newton <matthew-git at newtoncomputing.co.uk>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Mar 10 03:24:45 CET 2015 on sn-devel-104
    
    (cherry picked from commit c6cb2d650872a8c37820b65bb2d5882207263e88)

commit fe5ac733f12c9133453726569f1df2311f22cf10
Author: Matthew Newton <matthew-git at newtoncomputing.co.uk>
Date:   Sun Feb 22 23:31:48 2015 +0000

    Move wbc global variables into global context instead
    
    There are some global variables in use in the libwbclient
    library. Now that we have a context, move these into it so that
    they are thread-safe when the wbcCtx* functions are used.
    
    https://bugzilla.samba.org/show_bug.cgi?id=11149
    
    Signed-off-by: Matthew Newton <matthew-git at newtoncomputing.co.uk>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 2664d9070f3c21231627380822e619fb695db662)

commit bb70e50fa3cd9f322245a0045fa30157bfec51d9
Author: Matthew Newton <matthew-git at newtoncomputing.co.uk>
Date:   Sat Feb 21 22:30:11 2015 +0000

    Add context versions of wbclient functions
    
    To make the libwbclient library thread-safe, all functions
    that call through to wb_common winbindd_request_response need
    to have context that they can use. This commit adds all the
    necessary functions.
    
    https://bugzilla.samba.org/show_bug.cgi?id=11149
    
    Signed-off-by: Matthew Newton <matthew-git at newtoncomputing.co.uk>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 063c56dba590eec69439eb791a420b40505d4cc0)

commit b9d75f68eb7c46114aabdfa0c66a8bc1d37b9950
Author: Matthew Newton <matthew-git at newtoncomputing.co.uk>
Date:   Sat Jan 24 00:30:00 2015 +0000

    Add wbcContext to wbcRequestResponse
    
    To enable libwbclient to pass winbindd context through
    to the winbind client library in wb_common.
    
    https://bugzilla.samba.org/show_bug.cgi?id=11149
    
    Signed-off-by: Matthew Newton <matthew-git at newtoncomputing.co.uk>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 348f93ff6e25c43e0233432bd2134bb9eacb0b87)

commit a52f41837f7b35c662a91fca0f0e6eea74ff8e6b
Author: Matthew Newton <matthew-git at newtoncomputing.co.uk>
Date:   Sat Feb 21 00:19:32 2015 +0000

    Add wbcContext struct, create and free functions
    
    The basic context structure and functions for libwbclient so that
    libwbclient can be made thread-safe.
    
    https://bugzilla.samba.org/show_bug.cgi?id=11149
    
    Signed-off-by: Matthew Newton <matthew-git at newtoncomputing.co.uk>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit bc75e723ce063149278c95327ef91959718d27be)

commit ae434f4c8240e667acc19a67599797c96c623635
Author: Matthew Newton <matthew-git at newtoncomputing.co.uk>
Date:   Fri Jan 23 23:58:53 2015 +0000

    Use global context for winbindd_request_response
    
    Updating API call in libwbclient, wbinfo, ntlm_auth and
    winbind_nss_* as per previous commit to wb_common.c.
    
    https://bugzilla.samba.org/show_bug.cgi?id=11149
    
    Signed-off-by: Matthew Newton <matthew-git at newtoncomputing.co.uk>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 83cfb84b78ce7141652f1fdc7f01978cdb69343f)

commit 7f787b447485649fdf14ab2f44a39cf7fe3fc719
Author: Matthew Newton <matthew-git at newtoncomputing.co.uk>
Date:   Fri Jan 23 22:35:50 2015 +0000

    Make winbind client library thread-safe by adding context
    
    Rather than keep state in global variables, store the current
    context such as the winbind file descriptor in a struct that is
    passed in. This makes the winbind client library thread-safe.
    
    https://bugzilla.samba.org/show_bug.cgi?id=11149
    
    Signed-off-by: Matthew Newton <matthew-git at newtoncomputing.co.uk>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 60c7571984d7f1612828a72fae3ed8e66037d1f7)

commit f56d56ebd643386b3e6147749d1a8c85449ebd82
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 9 09:07:24 2015 +0100

    talloc: version 2.1.2
    
    Changes:
    - Allow destructors to reparent the object
    - Allow destructors to remove itself
    - Build improvements
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Günther Deschner <gd at samba.org>
    
    The last 5 patches address
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11144
    Memory leak in SMB2 notify handling.

commit 0693e46533c869c1b8095311b5e153000c901682
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 27 13:07:34 2015 +0100

    talloc: fix _talloc_total_limit_size prototype
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

commit f6df1e9b2fcc6edc9535a1757a009ac502d8d8c2
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Mar 3 17:12:32 2015 -0800

    lib: talloc: Test suite for the new destructor reparent logic.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sun Mar  8 20:52:43 CET 2015 on sn-devel-104

commit a21e4e2873794a80f8fb6e0e340be4ce6d327c33
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Mar 3 17:02:47 2015 -0800

    lib: talloc: Allow destructors to reparent the object they're called on.
    
    If a destructor returns failure (-1) when freeing a child, talloc
    must then reparent the child.
    
    Firstly it tries the owner of any reference, next the parent of the
    current object calling _talloc_free_children_internal(), and finally
    the null context in the last resort.
    
    If a destructor reparented its own object, which can be a very
    desirable thing to do (a destructor can make a decision it isn't
    time to die yet, and as the parent may be going away it might
    want to move itself to longer-term storage) then this new parent
    gets overwritten by the existing reparenting logic.
    
    This patch checks when freeing a child if it already reparented
    itself, and if it did doesn't then overwrite the new parent.
    
    Makes destructors more flexible.
    
    Needed for bug:
    
    https://bugzilla.samba.org/show_bug.cgi?id=11144
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>

commit 599ca101656d1111ff7aec32d1a813ef434d9977
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 5 12:48:47 2015 -0800

    lib: talloc: Fix bug when calling a destructor.
    
    If the destructor itself calls talloc_set_destructor()
    and returns -1, the new destructor set is overwritten
    by talloc.
    
    Dectect that and leave the new destructor in place.
    
    Needed for bug:
    
    https://bugzilla.samba.org/show_bug.cgi?id=11144
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ira Cooper <ira at samba.org>

commit bb97c5e20c7ad3c6ec6e6b46f73ceb5636bc478d
Author: Michael Adam <obnox at samba.org>
Date:   Mon Mar 9 15:15:37 2015 +0100

    s3-winbind: Fix chached user group lookup of trusted domains.
    
    If a user group lookup has aleady been done before with a machine
    account we did always return the incomplete information from the cache.
    This patch makes sure we return the correct group information from the
    netsamlogon cache.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11143
    
    Pair-Programmed-With: Andreas Schneider <asn at samba.org>
    Signed-off-by: Michael Adam <obnox at samba.org>
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    (cherry picked from commit f5d0204bfa1eb641fe7697613c1f773b6a7e65de)

commit e92a548728d8629687899b2581ee227d0fbf6ec3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 16:36:54 2014 -0700

    Be consistent about what functions add $LISTOPT and $LOADLIST to the command-line.
    
    Change-Id: Ife86624b53a99d48ce9f00d146b14f798c9bdb24
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Sun Nov 30 16:43:52 CET 2014 on sn-devel-104
    
    (cherry picked from commit 02e063bd5be06925489f735c51225b65ff961d6b)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit ebcba7ad56c4008886dc9d12bebdb4bc06081802
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 15:13:18 2014 -0700

    selftest: Add separate command line for listing tests, allowing us of subunit-filter (which doesn't support subunit v2).
    
    Change-Id: Icb877214a422c63fd38ef92425c7b4fe7ee19ad5
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 0f408599f83f5d8e68f0fb0f765143aa6620651e)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit d8aafcd562b8014083ef5adcdc010b466cfd4b58
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 16:06:09 2014 -0700

    selftest/tests.py: Remove testsuite samba.tests.samdb which does not have any tests.
    
    Change-Id: I8edcf73aa4a9b61c6e5c7cfb592a4692d4030a29
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit c3855dae71e557b824ad2679acd8bb5ad85936e2)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit b953fbdab88eed516e85a93ec658906478ce0b38
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 14:40:30 2014 -0700

    Re-use add_prefix function.
    
    Change-Id: I6e91bc9fc6714c147427e920ca0e3e22cb9a076b
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit afe94aa53549ec66cb48959260753a4fa424e481)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit df04a817e02830a2682d22863ca8236704b7cfb9
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 26 20:17:20 2014 -0700

    selftest: Drop support for TESTSUITE-IDLIST, and remove its last user.
    
    Change-Id: Ic616676bb770fa4769195d73c4309915646caae0
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit f6e3cd7f03a15595a2fa65c22a56c60d7d3f8bff)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 6bf5d335eaabbd19f5af383d008578194415d359
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 09:00:09 2014 -0800

    sam: Use samba.tests.subunitrun.
    
    Change-Id: Ic2ac4b335cf805ddbd442a065c4eaf6ef2b210d9
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 869a9f7a3a01810c1c1e3287b82034f67457b0b5)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit f847bb0c25fd7c71409c195e8fc3d4ee2d458502
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 21:31:18 2014 -0700

    Use samba.tests.subunitrun in dsdb ldap and ldap_schema tests.
    
    Change-Id: I51ddc55720a23013a2c6ae20e3225f027348083c
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 4f75f17ba7c9b80cf3aa0ce2db57e1754464403a)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 84547fa32113b889aae29e8d9259503e98a32432
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 21:22:59 2014 -0700

    Use samba.tests.subunitrun in urgent replication test.
    
    Change-Id: I3e7a32876d557ac376326ab75e851298e874d584
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 98b5380af65ea1ec760d00187355384de0757b04)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 502f424a15040c812f4892aa50c4d768bc978f80
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 07:09:00 2014 -0700

    Include mimeparse, which is used by subunit/testtools.
    
    Change-Id: I984c82acc0bc82a165e8ea17d8948c465c786905
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Sat Nov 22 04:44:11 CET 2014 on sn-devel-104
    
    (cherry picked from commit 2c67d55614668583dc6290c6db86d5229fb654ea)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit c845ccb5bb2de3007bd3b2ce9664f22235fce0c6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 09:44:05 2014 -0800

    ldap: Use samba.tests.subunitrun.
    
    Change-Id: I872654afb31a5eda8c88aac716f9ce79816e5f05
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit d857e7b1a7a2cc1f7f4f9f2ffd5a11f8c627ae39)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit fbf96116f5d37bc388bddc36a59349ffbb85c220
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 09:39:17 2014 -0800

    deletetest: use samba.tests.subunitrun.
    
    Change-Id: I13565c7c14ea186709ce1de9038ef840c5b766b8
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit cfb5e9bbf2bde885c50097ab0a2914c674e65860)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 6fbfee387625b02e646886a36838f184e717113f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 09:32:58 2014 -0800

    ldap_syntaxes: Use samba.tests.subunitrun.
    
    Change-Id: Ib62b747876b4408fdc8ff44e9b4c63578e1a6408
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 6fb26c0e29d74c793f8714b057e0ed0e5ee0cc37)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 249491441ff96378fdc2abdcf05e861c7a2a1feb
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 09:30:50 2014 -0800

    password lockout: Use samba.tests.subunitrun.
    
    Change-Id: I848099d22acd4a0ce7d589de48eb72e2d180ceae
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 3961bd68cad510c3ac06270036b54b065d0c3566)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 0bd1fde89742784d90a484845dacf12614b6d8c1
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 09:13:06 2014 -0800

    passwords: Use samba.tests.subunitrun.
    
    Change-Id: Ib806f63ef412fec264445eefd82146e5140b0bac
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit eae1efca41f4714afedff74afe330aad970f44ab)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit fb370775190bc24f4f3930e84915242bebe58fe9
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 08:57:37 2014 -0800

    sec_descriptor: Use samba.tests.subunitrun.
    
    Change-Id: I5caba3e27ad21cc5381883a823e0ec5e2966a264
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 0c82bdda0fddab4aa6bdbbbe13b6f888ed1c2c67)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 17f62c0d85fdb8de95116d30f0bf8fde841b42cf
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Mar 6 14:41:50 2015 +1300

    token_group: Use samba.tests.subunitrun.
    
    Change-Id: Id7c247451532eded1f44ef9b1aa1808dd18098c6
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    (backport similar to commit fc0b8aac9d5f1f77aa9a412fa5da2cc6b1a984ae)
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit c42d07ebc124c4ec654e0710896d8186670bfa15
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 08:37:08 2014 -0800

    sites: Use samba.tests.subunitrun.
    
    Change-Id: Ic06e1a0f7174683b6b817a5412b8635145329c00
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 330597507c796db55a48b084c7542f03ee4a93ee)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 84d21d816a021bf04ca6364e69043a27ea79168d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 08:32:24 2014 -0800

    speedtest: Use samba.tests.subunitrun.
    
    Change-Id: Id842c3f74aec24faeab68e975ff4d9e9a0dc337b
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit d6545fe27b35e63781f9f87fe9262bb933ffa9be)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit c41dfc5a8730e4840dd978b4485414fa72cd7958
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 08:30:23 2014 -0800

    credentials test: Use samba.tests.subunitrun.
    
    Change-Id: I8970c66de9535cb8d48b17d88b2759b7d1e39cb8
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 8d933a84c96859cbb782d5ac693f9badf2531947)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 8f76884c413b910bc370c70f2ff568488931ff7d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 2 08:23:36 2014 -0800

    sec_descriptor test: Simplify, use samba.tests.subunitrun module.
    
    Change-Id: I4ffda49cf3e209eaa28fc83f6fd9ded47f0ad7ee
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 21280da0d6a4e3c547de8f486fe6ae84eea3f135)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 368e50ff617dda5965e3de7aacb4bd08e5ee24c2
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 21:17:39 2014 -0700

    Move option handling into samba.tests.subunitrun.
    
    Change-Id: I65a73b74854af636413f4f284147f3bcf28b6f82
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit ee281c61d01b5fb167571b8ace5e739758100db6)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 247974bd977607aa289c1ffb4a5cef0a1f200090
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 21:08:49 2014 -0700

    Move option parsing to samba.tests.subunitrun.
    
    Change-Id: I2939c1b6ebb9739530efa9bc4667668cff7a7aeb
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 24035a6b3ed5ffdb1e75ebd375c3f7c2129742ff)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 2969bbe79f2c879086c5a10269f328c66ecbf1bd
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 20:57:09 2014 -0700

    subunitrun: Use new samba.tests.subunitrun module.
    
    Change-Id: Ie32f16d72c80c831adfd9a8d32735fa348962123
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit ed4c07b34b5571c021684e3df6bf5fc63cde69c5)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 4e1e2553e17cd512362962c82c53447badcbdf3b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 20:51:46 2014 -0700

    Add convenience class for old-style Samba subunit python tests.
    
    Change-Id: I84a97cc71cfa99c14e0c93ec19ff9eea6149bb5a
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 8d8d800a0f8ea3e822ee4d3693058b24307ba4e2)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 5ef96510ac0968e0f8aee2cdc29be49593d4eb4f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 25 11:09:10 2014 -0700

    Add bundled copy of 'extras' python module used by newer versions of testtools/subunit.
    
    Change-Id: I5ad9222ccb4228a4b16d54a578276d4b9d4e6c4d
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit a92877f955baf0ed8420f77898bd4405bd319c67)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 48a92dd56a0c8eadb46ccd0bf609c212ed23a0e6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 26 11:31:38 2014 -0700

    filter-subunit: Consistently use spaces rather than tabs.
    
    Change-Id: I760399cb4bf0aa9753f5f1e842919b386e1caca9
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Wed Nov 19 20:50:29 CET 2014 on sn-devel-104
    
    (cherry picked from commit 71a9e5da2be8feae2f7cbb248b7c091f435d964e)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 88b864a3ebf1974de8dc973238818a8a12728989
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 10:17:23 2014 -0700

    Support using system ldbmodify.
    
    Fixes this test when bin/ldbmodify isn't built because we're using the
    system ldbmodify.
    
    Change-Id: I2ff0d9808245353006c6be4989976a3edad8f98e
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 49445541e750328fc9b766593eddc61a65f97ccb)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit daa54fd9b81a48b22c92cd85dc8cd8df4b6c1668
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 15:57:35 2014 -0700

    Fix subunit test suite name.
    
    Only run it when testscenarios is installed, as it depends on that.
    
    Change-Id: I1e1284024cf94f909e585a55b8a15e33273f167b
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit fb08cd5310c2c806e49597da4c3a310b058645ae)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit d9c4441d7794a7d75dc0e9869096c8eac563213b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 20:06:52 2014 -0700

    dsdb.tests.acl: Create and run a single testsuite, should easy migration to regulary Python unit tests.
    
    Change-Id: I89072d3af1d90e87a47c197d28943f47cedc5deb
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 1800bc567d56d0c193410a83692185ebbbce7f43)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit df1e7b9bdd0416061ca3024df8db0664459cc9c8
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 20:07:02 2014 -0700

    dsdb.tests.ldap: Create and run a single testsuite, should easy migration to regulary Python unit tests.
    
    Change-Id: I07216ff1063e127b541bf4e5d6349d5a75cec678
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit d8177912be179dc4342118827ce439048df43ef9)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 27c6ebfff4913c9e3855f241ebb24681546d6c5c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 20:09:12 2014 -0700

    speedtest: Create and run a single testsuite, should easy migration to regulary Python unit tests.
    
    Change-Id: Ib31eb26b8f6094a51cd4985b9ae98d018ae95c2d
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 5757c5071e3cf5f207bc9772beffe5c2a7eb22f3)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit b01799aa3ff792b0ab9cb9326f1bcb4bdbbe57c5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 20:27:30 2014 -0700

    dirsync test: Create and run a single testsuite, should easy migration to regulary Python unit tests.
    
    Change-Id: I6fbffd6453f8af966938943f2895bd6d93f8fb59
    Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 7f0969d79a45c7ae4c62a319889680bf3117b71c)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit b6c97838f073089f0a2e84ab024a1c141b877042
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 12 21:18:08 2014 -0700

    filter-subunit: Drop support for allow_empty_output hack.
    
    Change-Id: If4f336ef770202dcf69484b9bccc6c0c80bd5f9b
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue Oct 14 09:06:05 CEST 2014 on sn-devel-104
    
    (cherry picked from commit 0c2c75a2d7afdb3e08aa29f6b996d953dcc3b5a1)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit a72824bcc4fee5bb9a2e9346e96f0ab8917bd5c3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 12 21:17:05 2014 -0700

    samba3dump: Add subunit-enabled test for samba3dump.
    
    Change-Id: Ie9682c715fc91d923dcd1951236f8b36fa519327
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 77b72d4c8e02e6bba9ef8c90287455a784afe9d8)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 7af1da10208995df0190671140b21ed2a559b25a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 12 21:11:22 2014 -0700

    urgent_replication: Use subunit reporting, remove allow_empty_output.
    
    Change-Id: I6d479b218eff6c4292fbb99e4760bbd62ce1f380
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit 23ac8d130c1f476fda5d984531266a6c210c2982)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit defd8b3cbbf9a3e5061150c4fc3ef825422a1b8c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 1 06:56:09 2014 -0700

    Remove unused imports.
    
    Change-Id: I8915f62206edb53ffc2d89434e46d9e71db8bb9a
    Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    (cherry picked from commit f0fa5636e30063a75f2942013fc1579afa3525c2)
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11137

commit 9e69843f368dfc0359078eab09f38219d28dbbfd
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Dec 18 15:14:36 2014 +0000

    spoolss: retrieve published printer GUID if not in registry
    
    When a printer is published, the GUID for the published DN is retrieved
    from the domain controller and stored in the registry.
    When handling a spoolss GetPrinter(level=7) request, the same GUID is
    obtained from the registry and returned to the client.
    
    This change sees the spoolss server query the DC for the published
    printer GUID if it is not present in the registry when handling a
    spoolss GetPrinter(level=7) request.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11018
    
    Pair-Programmed-With: David Disseldorp <ddiss at samba.org>
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    (cherry picked from commit a4157e7c5d75be7003ad0b72fdfe9856a9e5ba8f)

commit f2962975c9e8de1ce47b38862b460f0a1e460650
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Dec 18 15:13:27 2014 +0000

    printing: rework nt_printer_guid_store to return errors
    
    Callers can now choose whether or not to ignore errors.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11018
    
    Pair-programmed-with: David Disseldorp <ddiss at samba.org>
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    (cherry picked from commit 6595ced146a53dcef9bbd5d2deb82a44c8ce1a1a)

commit df9b1ca3f9691e87099bd67fe4216c0a5eb77eb4
Author: David Disseldorp <ddiss at samba.org>
Date:   Thu Dec 18 18:23:11 2014 +0100

    printing: add nt_printer_guid_retrieve() helper
    
    This function connects to the domain controller and retrieves the
    GUID for the corresponding printer DN.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11018
    
    Pair-programmed-with: Andreas Schneider <asn at samba.org>
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    (cherry picked from commit 38dbd054dc331a441b10fdebbdb4bd0fc51cfc0a)

commit 5c1b979ae8b65f4a33e53d6056cfee9e7e9da1e3
Author: David Disseldorp <ddiss at samba.org>
Date:   Thu Dec 18 18:18:21 2014 +0100

    printing: split out printer DN and GUID retrieval
    
    This functions are used for printer publishing.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11018
    
    Pair-programmed-with: Andreas Schneider <asn at samba.org>
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    (cherry picked from commit 7cabd89789a50d37fc32735968c493092a37e69f)

commit 7c48f5316c0e56afc98966c5a9bfc4b424cfe696
Author: Christof Schmitt <cs at samba.org>
Date:   Wed Mar 11 15:54:55 2015 -0700

    brlock: Use 0 instead of empty initializer list
    
    C does not allow empty initializer lists. Although gcc accepts that, the
    SunOS compiler fails in this case with an error.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11153
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Christof Schmitt <cs at samba.org>
    Autobuild-Date(master): Thu Mar 12 02:49:36 CET 2015 on sn-devel-104
    (cherry picked from commit ddcf3614ce14e7cb03195e36f872043542bc4ec1)

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

Summary of changes:
 auth/credentials/tests/bind.py                     |  42 +-
 auth/ntlmssp/ntlmssp_client.c                      |  40 +-
 docs-xml/manpages/idmap_rid.8.xml                  |   3 -
 lib/extras/.gitignore                              |  35 ++
 lib/{testtools => extras}/.testr.conf              |   0
 lib/{ccan/time => extras}/LICENSE                  |  17 +-
 lib/extras/MANIFEST.in                             |   6 +
 lib/extras/Makefile                                |  30 +
 lib/extras/NEWS                                    |  27 +
 lib/extras/README.rst                              |  57 ++
 .../helpers.py => extras/extras/__init__.py}       |  52 +-
 lib/extras/extras/tests/__init__.py                |  17 +
 .../extras/tests/test_extras.py}                   |  37 +-
 lib/extras/setup.cfg                               |   4 +
 lib/extras/setup.py                                |  48 ++
 {buildtools/wafsamba => lib/mimeparse}/__init__.py |   0
 lib/mimeparse/mimeparse.py                         | 167 +++++
 lib/mimeparse/mimeparse_test.py                    |  68 ++
 lib/mimeparse/setup.py                             |  50 ++
 lib/replace/wscript                                |   2 +-
 ...oc-util-2.0.6.sigs => pytalloc-util-2.1.2.sigs} |   0
 .../ABI/{talloc-2.1.0.sigs => talloc-2.1.2.sigs}   |   0
 lib/talloc/talloc.c                                |  17 +-
 lib/talloc/testsuite.c                             |  82 +++
 lib/talloc/wscript                                 |   2 +-
 lib/testtools/NEWS                                 | 410 +++++++++++++
 lib/update-external.sh                             |  15 +
 lib/wscript_build                                  |   5 +-
 libcli/auth/netlogon_creds_cli.h                   |   2 +-
 libcli/smb/smbXcli_base.c                          |   1 +
 nsswitch/libwbclient/ABI/wbclient-0.12.sigs        | 130 ++++
 nsswitch/libwbclient/wbc_idmap.c                   |  70 ++-
 nsswitch/libwbclient/wbc_pam.c                     | 198 ++++--
 nsswitch/libwbclient/wbc_pwd.c                     | 222 ++++---
 nsswitch/libwbclient/wbc_sid.c                     | 169 +++--
 nsswitch/libwbclient/wbc_util.c                    | 123 +++-
 nsswitch/libwbclient/wbclient.c                    |  90 ++-
 nsswitch/libwbclient/wbclient.h                    | 683 ++++++++++++++++++++-
 nsswitch/libwbclient/wbclient_internal.h           |  13 +-
 nsswitch/libwbclient/wscript                       |   2 +-
 nsswitch/tests/test_rfc2307_mapping.sh             |   7 +-
 nsswitch/wb_common.c                               | 181 ++++--
 nsswitch/wbinfo.c                                  |   4 +-
 nsswitch/winbind_client.h                          |  23 +-
 nsswitch/winbind_nss_aix.c                         |  30 +-
 nsswitch/winbind_nss_linux.c                       |  49 +-
 nsswitch/winbind_nss_netbsd.c                      |   3 +-
 nsswitch/winbind_nss_solaris.c                     |   9 +-
 python/samba/tests/__init__.py                     |   7 +-
 python/samba/tests/subunitrun.py                   |  75 +++
 selftest/filter-subunit                            |  74 +--
 selftest/format-subunit                            |   2 +
 selftest/selftest.pl                               |  29 +-
 selftest/selftesthelpers.py                        |  58 +-
 selftest/testlist.py                               |   7 +-
 selftest/tests.py                                  |   8 +-
 selftest/tests/test_testlist.py                    |   6 +-
 source3/include/libsmb_internal.h                  |   1 +
 source3/include/nt_printing.h                      |   6 +
 source3/libsmb/libsmb_server.c                     |  16 +
 source3/libsmb/ntlmssp.c                           |  38 +-
 source3/locking/brlock.c                           |   2 +-
 source3/printing/nt_printing_ads.c                 | 312 +++++++---
 source3/rpc_server/spoolss/srv_spoolss_nt.c        |  20 +-
 source3/utils/ntlm_auth.c                          |  16 +-
 source3/winbindd/wb_lookupusergroups.c             |  11 +
 source4/dsdb/tests/python/acl.py                   |  78 ++-
 source4/dsdb/tests/python/deletetest.py            | 112 ++--
 source4/dsdb/tests/python/dirsync.py               |  38 +-
 source4/dsdb/tests/python/ldap.py                  | 211 +++----
 source4/dsdb/tests/python/ldap_schema.py           |  55 +-
 source4/dsdb/tests/python/ldap_syntaxes.py         |  40 +-
 source4/dsdb/tests/python/password_lockout.py      | 189 +++---
 source4/dsdb/tests/python/passwords.py             | 232 ++++---
 source4/dsdb/tests/python/sam.py                   |  12 +-
 source4/dsdb/tests/python/sec_descriptor.py        |  36 +-
 source4/dsdb/tests/python/sites.py                 |  17 +-
 source4/dsdb/tests/python/token_group.py           |  24 +-
 source4/dsdb/tests/python/urgent_replication.py    | 127 ++--
 source4/lib/tls/tlscert.c                          |   4 +-
 source4/lib/tls/wscript                            |  22 +-
 source4/rpc_server/backupkey/dcesrv_backupkey.c    |   4 +-
 source4/rpc_server/wscript_build                   |   2 +-
 source4/scripting/bin/subunitrun                   |  32 +-
 source4/scripting/devel/speedtest.py               |  22 +-
 source4/selftest/test_samba3dump.sh                |  14 +
 source4/selftest/tests.py                          |  34 +-
 source4/torture/winbind/struct_based.c             |   2 +-
 88 files changed, 3888 insertions(+), 1349 deletions(-)
 create mode 100644 lib/extras/.gitignore
 copy lib/{testtools => extras}/.testr.conf (100%)
 copy lib/{ccan/time => extras}/LICENSE (77%)
 create mode 100644 lib/extras/MANIFEST.in
 create mode 100644 lib/extras/Makefile
 create mode 100644 lib/extras/NEWS
 create mode 100644 lib/extras/README.rst
 copy lib/{testtools/testtools/helpers.py => extras/extras/__init__.py} (74%)
 create mode 100644 lib/extras/extras/tests/__init__.py
 copy lib/{testtools/testtools/tests/test_helpers.py => extras/extras/tests/test_extras.py} (88%)
 create mode 100644 lib/extras/setup.cfg
 create mode 100755 lib/extras/setup.py
 copy {buildtools/wafsamba => lib/mimeparse}/__init__.py (100%)
 create mode 100644 lib/mimeparse/mimeparse.py
 create mode 100644 lib/mimeparse/mimeparse_test.py
 create mode 100644 lib/mimeparse/setup.py
 copy lib/talloc/ABI/{pytalloc-util-2.0.6.sigs => pytalloc-util-2.1.2.sigs} (100%)
 copy lib/talloc/ABI/{talloc-2.1.0.sigs => talloc-2.1.2.sigs} (100%)
 create mode 100644 nsswitch/libwbclient/ABI/wbclient-0.12.sigs
 create mode 100755 python/samba/tests/subunitrun.py
 create mode 100755 source4/selftest/test_samba3dump.sh


Changeset truncated at 500 lines:

diff --git a/auth/credentials/tests/bind.py b/auth/credentials/tests/bind.py
index aa4b17a..91e493d 100755
--- a/auth/credentials/tests/bind.py
+++ b/auth/credentials/tests/bind.py
@@ -5,30 +5,20 @@
 import optparse
 import sys
 import base64
-import re
-import os
 import copy
 import time
 
 sys.path.insert(0, "bin/python")
 import samba
-samba.ensure_external_module("testtools", "testtools")
-samba.ensure_external_module("subunit", "subunit/python")
+from samba.tests.subunitrun import SubunitOptions, TestProgram
 
 import samba.getopt as options
 
-from ldb import (
-    SCOPE_BASE, SCOPE_SUBTREE, LdbError, ERR_NO_SUCH_OBJECT)
-from samba.dcerpc import security
+from ldb import SCOPE_BASE, SCOPE_SUBTREE
 
-from samba.auth import system_session
 from samba import gensec
-from samba.samdb import SamDB
-from samba.credentials import Credentials
-import samba.tests, unittest
+import samba.tests
 from samba.tests import delete_force
-from subunit.run import SubunitTestRunner
-from samba.tests import TestCase, TestSkipped
 
 parser = optparse.OptionParser("ldap [options] <host>")
 sambaopts = options.SambaOptions(parser)
@@ -37,6 +27,8 @@ parser.add_option_group(sambaopts)
 # use command line creds if available
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
+subunitopts = SubunitOptions(parser)
+parser.add_option_group(subunitopts)
 opts, args = parser.parse_args()
 
 if len(args) < 1:
@@ -59,8 +51,11 @@ class BindTests(samba.tests.TestCase):
     def setUp(self):
         super(BindTests, self).setUp()
         # fetch rootDSEs
+
+        self.ldb = samba.tests.connect_samdb(host, credentials=creds, lp=lp, ldap_only=True)
+
         if self.info_dc is None:
-            res = ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["*"])
+            res = self.ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["*"])
             self.assertEquals(len(res), 1)
             BindTests.info_dc = res[0]
         # cache some of RootDSE props
@@ -76,8 +71,8 @@ class BindTests(samba.tests.TestCase):
 
     def test_computer_account_bind(self):
         # create a computer acocount for the test
-        delete_force(ldb, self.computer_dn)
-        ldb.add_ldif("""
+        delete_force(self.ldb, self.computer_dn)
+        self.ldb.add_ldif("""
 dn: """ + self.computer_dn + """
 cn: CENTOS53
 displayName: CENTOS53$
@@ -95,7 +90,7 @@ dNSHostName: centos53.alabala.test
 operatingSystemVersion: 5.2 (3790)
 operatingSystem: Windows Server 2003
 """)
-        ldb.modify_ldif("""
+        self.ldb.modify_ldif("""
 dn: """ + self.computer_dn + """
 changetype: modify
 replace: unicodePwd
@@ -112,8 +107,8 @@ unicodePwd:: """ + base64.b64encode("\"P at ssw0rd\"".encode('utf-16-le')) + """
 
     def test_user_account_bind(self):
         # create user
-        ldb.newuser(username=self.username, password=self.password)
-        ldb_res = ldb.search(base=self.domain_dn,
+        self.ldb.newuser(username=self.username, password=self.password)
+        ldb_res = self.ldb.search(base=self.domain_dn,
                                       scope=SCOPE_SUBTREE,
                                       expression="(samAccountName=%s)" % self.username)
         self.assertEquals(len(ldb_res), 1)
@@ -144,11 +139,4 @@ unicodePwd:: """ + base64.b64encode("\"P at ssw0rd\"".encode('utf-16-le')) + """
         res = ldb_user3.search(base="", expression="", scope=SCOPE_BASE, attrs=["*"])
 
 
-ldb = samba.tests.connect_samdb(host, credentials=creds, lp=lp, ldap_only=True)
-
-runner = SubunitTestRunner()
-rc = 0
-if not runner.run(unittest.makeSuite(BindTests)).wasSuccessful():
-    rc = 1
-
-sys.exit(rc)
+TestProgram(module=__name__, opts=subunitopts)
diff --git a/auth/ntlmssp/ntlmssp_client.c b/auth/ntlmssp/ntlmssp_client.c
index f99257d..d8531e4c 100644
--- a/auth/ntlmssp/ntlmssp_client.c
+++ b/auth/ntlmssp/ntlmssp_client.c
@@ -132,12 +132,13 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security,
 		talloc_get_type_abort(gensec_security->private_data,
 				      struct gensec_ntlmssp_context);
 	struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
-	uint32_t chal_flags, ntlmssp_command, unkn1, unkn2;
+	uint32_t chal_flags, ntlmssp_command, unkn1 = 0, unkn2 = 0;
 	DATA_BLOB server_domain_blob;
 	DATA_BLOB challenge_blob;
 	DATA_BLOB target_info = data_blob(NULL, 0);
 	char *server_domain;
 	const char *chal_parse_string;
+	const char *chal_parse_string_short = NULL;
 	const char *auth_gen_string;
 	DATA_BLOB lm_response = data_blob(NULL, 0);
 	DATA_BLOB nt_response = data_blob(NULL, 0);
@@ -178,6 +179,7 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security,
 			chal_parse_string = "CdUdbddB";
 		} else {
 			chal_parse_string = "CdUdbdd";
+			chal_parse_string_short = "CdUdb";
 		}
 		auth_gen_string = "CdBBUUUBd";
 	} else {
@@ -185,6 +187,7 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security,
 			chal_parse_string = "CdAdbddB";
 		} else {
 			chal_parse_string = "CdAdbdd";
+			chal_parse_string_short = "CdAdb";
 		}
 
 		auth_gen_string = "CdBBAAABd";
@@ -199,10 +202,39 @@ NTSTATUS ntlmssp_client_challenge(struct gensec_security *gensec_security,
 			 &challenge_blob, 8,
 			 &unkn1, &unkn2,
 			 &target_info)) {
+
+		bool ok = false;
+
 		DEBUG(1, ("Failed to parse the NTLMSSP Challenge: (#2)\n"));
-		dump_data(2, in.data, in.length);
-		talloc_free(mem_ctx);
-		return NT_STATUS_INVALID_PARAMETER;
+
+		if (chal_parse_string_short != NULL) {
+			/*
+			 * In the case where NTLMSSP_NEGOTIATE_TARGET_INFO
+			 * is not used, some NTLMSSP servers don't return
+			 * the unused unkn1 and unkn2 fields.
+			 * See bug:
+			 * https://bugzilla.samba.org/show_bug.cgi?id=10016
+			 * for packet traces.
+			 * Try and parse again without them.
+			 */
+			ok = msrpc_parse(mem_ctx,
+				&in, chal_parse_string_short,
+				"NTLMSSP",
+				&ntlmssp_command,
+				&server_domain,
+				&chal_flags,
+				&challenge_blob, 8);
+			if (!ok) {
+				DEBUG(1, ("Failed to short parse "
+					"the NTLMSSP Challenge: (#2)\n"));
+			}
+		}
+
+		if (!ok) {
+			dump_data(2, in.data, in.length);
+			talloc_free(mem_ctx);
+			return NT_STATUS_INVALID_PARAMETER;
+		}
 	}
 
 	if (chal_flags & NTLMSSP_TARGET_TYPE_SERVER) {
diff --git a/docs-xml/manpages/idmap_rid.8.xml b/docs-xml/manpages/idmap_rid.8.xml
index 2db15e2..520d605 100644
--- a/docs-xml/manpages/idmap_rid.8.xml
+++ b/docs-xml/manpages/idmap_rid.8.xml
@@ -65,8 +65,6 @@
 			This means SIDs with a RID less than the base rid are filtered.
 			The default is not to restrict the allowed rids at all,
 			i.e. a base_rid value of 0.
-			A good value for the base_rid can be 1000, since user
-			RIDs by default start at 1000 (512 hexadecimal).
 		</para>
 		<para>
 			Use of this parameter is deprecated.
@@ -114,7 +112,6 @@
 
 	idmap config TRUSTED : backend  = rid
 	idmap config TRUSTED : range    = 50000 - 99999
-	idmap config TRUSTED : base_rid = 1000
 	</programlisting>
 </refsect1>
 
diff --git a/lib/extras/.gitignore b/lib/extras/.gitignore
new file mode 100644
index 0000000..cfc114c
--- /dev/null
+++ b/lib/extras/.gitignore
@@ -0,0 +1,35 @@
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+MANIFEST
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# editors
+*.swp
+*~
+
+# Testrepository
+.testrepository
diff --git a/lib/testtools/.testr.conf b/lib/extras/.testr.conf
similarity index 100%
copy from lib/testtools/.testr.conf
copy to lib/extras/.testr.conf
diff --git a/lib/ccan/time/LICENSE b/lib/extras/LICENSE
similarity index 77%
copy from lib/ccan/time/LICENSE
copy to lib/extras/LICENSE
index 89de354..4dfca45 100644
--- a/lib/ccan/time/LICENSE
+++ b/lib/extras/LICENSE
@@ -1,3 +1,12 @@
+Copyright (c) 2010-2012 the extras authors.
+
+The extras authors are:
+ * Jonathan Lange
+ * Martin Pool
+ * Robert Collins
+
+and are collectively referred to as "extras developers".
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -5,13 +14,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/lib/extras/MANIFEST.in b/lib/extras/MANIFEST.in
new file mode 100644
index 0000000..da2696e
--- /dev/null
+++ b/lib/extras/MANIFEST.in
@@ -0,0 +1,6 @@
+include LICENSE
+include Makefile
+include MANIFEST.in
+include NEWS
+include README.rst
+include .gitignore
diff --git a/lib/extras/Makefile b/lib/extras/Makefile
new file mode 100644
index 0000000..270e8d1
--- /dev/null
+++ b/lib/extras/Makefile
@@ -0,0 +1,30 @@
+# See README.rst for copyright and licensing details.
+
+PYTHON=python
+SOURCES=$(shell find extras -name "*.py")
+
+check:
+	PYTHONPATH=$(PWD) $(PYTHON) -m testtools.run extras.tests.test_suite
+
+TAGS: ${SOURCES}
+	ctags -e -R extras/
+
+tags: ${SOURCES}
+	ctags -R extras/
+
+clean:
+	rm -f TAGS tags
+	find extras -name "*.pyc" -exec rm '{}' \;
+
+### Documentation ###
+
+apidocs:
+	# pydoctor emits deprecation warnings under Ubuntu 10.10 LTS
+	PYTHONWARNINGS='ignore::DeprecationWarning' \
+		pydoctor --make-html --add-package extras \
+		--docformat=restructuredtext --project-name=extras \
+		--project-url=https://launchpad.net/extras
+
+
+.PHONY: apidocs
+.PHONY: check clean
diff --git a/lib/extras/NEWS b/lib/extras/NEWS
new file mode 100644
index 0000000..60713b8
--- /dev/null
+++ b/lib/extras/NEWS
@@ -0,0 +1,27 @@
+extras NEWS
++++++++++++
+
+Changes and improvements to extras_, grouped by release.
+
+NEXT
+~~~~
+
+0.0.3
+~~~~~
+
+* Extras setup.py would break on older testtools releases, which could break
+  installs of newer testtools due to extras then failing to install.
+  (Robert Collins)
+
+0.0.2
+~~~~~
+
+* Fix Makefile to not have cruft leftover from testtools.
+
+0.0.1
+~~~~~
+
+* Initial extraction from testtools.
+
+
+.. _extras: http://pypi.python.org/pypi/extras
diff --git a/lib/extras/README.rst b/lib/extras/README.rst
new file mode 100644
index 0000000..7d3f10b
--- /dev/null
+++ b/lib/extras/README.rst
@@ -0,0 +1,57 @@
+======
+extras
+======
+
+extras is a set of extensions to the Python standard library, originally
+written to make the code within testtools cleaner, but now split out for
+general use outside of a testing context.
+
+
+Documentation
+-------------
+
+pydoc extras is your friend. extras currently contains the following functions:
+
+* try_import
+
+* try_imports
+
+* safe_hasattr
+
+Which do what their name suggests.
+
+
+Licensing
+---------
+
+This project is distributed under the MIT license and copyright is owned by
+the extras authors. See LICENSE for details.
+
+
+Required Dependencies
+---------------------
+
+ * Python 2.6+ or 3.0+
+
+
+Bug reports and patches
+-----------------------
+
+Please report bugs using github issues at <https://github.com/testing-cabal/extras>.
+Patches can also be submitted via github.  You can mail the authors directly
+via the mailing list testtools-dev at lists.launchpad.net. (Note that Launchpad
+discards email from unknown addresses - be sure to sign up for a Launchpad
+account before mailing the list, or your mail will be silently discarded).
+
+
+History
+-------
+
+extras used to be testtools.helpers, and was factored out when folk wanted to
+use it separately.
+
+
+Thanks
+------
+
+ * Martin Pool
diff --git a/lib/testtools/testtools/helpers.py b/lib/extras/extras/__init__.py
similarity index 74%
copy from lib/testtools/testtools/helpers.py
copy to lib/extras/extras/__init__.py
index 2595c1d..5f16625 100644
--- a/lib/testtools/testtools/helpers.py
+++ b/lib/extras/extras/__init__.py
@@ -1,4 +1,8 @@
-# Copyright (c) 2010-2012 testtools developers. See LICENSE for details.
+# Copyright (c) 2010-2012 extras developers. See LICENSE for details.
+
+"""Extensions to the Python standard library."""
+
+import sys
 
 __all__ = [
     'safe_hasattr',
@@ -6,7 +10,19 @@ __all__ = [
     'try_imports',
     ]
 
-import sys
+# same format as sys.version_info: "A tuple containing the five components of
+# the version number: major, minor, micro, releaselevel, and serial. All
+# values except releaselevel are integers; the release level is 'alpha',
+# 'beta', 'candidate', or 'final'. The version_info value corresponding to the
+# Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
+# releaselevel of 'dev' for unreleased under-development code.
+#
+# If the releaselevel is 'alpha' then the major/minor/micro components are not
+# established at this point, and setup.py will use a version of next-$(revno).
+# If the releaselevel is 'final', then the tarball will be major.minor.micro.
+# Otherwise it is major.minor.micro~$(revno).
+
+__version__ = (0, 0, 3, 'final', 0)
 
 
 def try_import(name, alternative=None, error_callback=None):
@@ -85,35 +101,3 @@ def safe_hasattr(obj, attr, _marker=object()):
     properties.
     """
     return getattr(obj, attr, _marker) is not _marker
-
-
-def map_values(function, dictionary):
-    """Map ``function`` across the values of ``dictionary``.
-
-    :return: A dict with the same keys as ``dictionary``, where the value
-        of each key ``k`` is ``function(dictionary[k])``.
-    """
-    return dict((k, function(dictionary[k])) for k in dictionary)
-
-
-def filter_values(function, dictionary):
-    """Filter ``dictionary`` by its values using ``function``."""
-    return dict((k, v) for k, v in dictionary.items() if function(v))
-
-
-def dict_subtract(a, b):
-    """Return the part of ``a`` that's not in ``b``."""
-    return dict((k, a[k]) for k in set(a) - set(b))
-
-
-def list_subtract(a, b):
-    """Return a list ``a`` without the elements of ``b``.
-
-    If a particular value is in ``a`` twice and ``b`` once then the returned
-    list then that value will appear once in the returned list.
-    """
-    a_only = list(a)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list