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

Karolin Seeger kseeger at samba.org
Tue Oct 27 10:51:03 UTC 2020


The branch, v4-13-test has been updated
       via  c4938561a97 daemons: report status to systemd even when running in foreground
       via  ff781ba4682 docs: fix default value of spoolss:architecture
       via  24ae26cb49e provision: BIND 9.17.x is not supported
       via  a831cc5799b provision: Add support for BIND 9.16.x
       via  f6b6867d549 bind9-dlz: Add support for BIND 9.16.x
       via  34513738155 provision: BIND 9.15.x is not supported
       via  4e65cc6058e provision: Add support for BIND 9.14.x
       via  63d94da74a6 bind9-dlz: Add support for BIND 9.14.x
       via  b5bc60e77d3 provision: BIND 9.13.x is not supported
       via  8e2ef3cda23 bind9-dlz: Bind 9.13.x switched to using bool as isc_boolean_t instead of int.
       via  61cd114be10 examples:auth: Do not install example plugin
       via  b5b7a958ef6 s3:modules: Do not install vfs modules only used for testing
       via  cfd5b368d42 unittests: Mark test binaries for selftest
       via  a4c241736bc buildtools: Do not install binaries which are for selftest
       via  fe28ffc4a7e s3:script: Fix test_dfree_quota.sh
       via  d76e1b43e2d third_party: Update resolv_wrapper to version 1.1.7
       via  995478c9378 testprogs: Fix and improve upgradeprovision-oldrelease test
       via  e51a5e8aea4 testprogs: Fix and improve dbcheck-oldrelease test
       via  7357ddefe33 testprogs: Fix and improve functionalprep test
       via  7b2c975a88b testprogs: Fix and improve dbcheck-links test
       via  2aad79378ad testprogs: Fix and improve runtime-links test
       via  62e97089a88 testprogs: Fix and improve tombstones-expunge test
       via  33b116da10a testprogs: Fix and improve demote-saveddb test
       via  daeada8e48e testprogs: Add remove_directory to common test functions
       via  069c5acc4b6 python: Create targetdir recursively
       via  15e15f7c21b nsswitch/nsstest.c: Avoid nss function conflicts with glibc nss.h
       via  b15f35b5738 s4:dsdb:acl_read: Implement "List Object" mode feature
       via  0918966f9d5 s4:dsdb:util: add dsdb_do_list_object() helper
       via  160a2d6a5f9 s4:dsdb:acl_read: defer LDB_ERR_NO_SUCH_OBJECT
       via  ee5b2e3be90 s4:dsdb:acl_read: make use of aclread_check_object_visible() for the search base
       via  24e0a440a93 s4:dsdb:acl_read: fully set up 'struct aclread_context' before the search base acl check
       via  540cd43baf2 s4:dsdb:acl_read: introduce aclread_check_object_visible() helper
       via  f92b61ec826 s4:dsdb:tests: add AclVisibiltyTests
       via  a89a78aa609 python/tests: add DynamicTestCase setUpDynamicTestCases() infrastructure
       via  e759ecdae11 ctdb-tests: Strengthen node state checking in ctdb disable/enable test
       via  710b287bdc9 ctdb-recoverd: Drop unnecessary and broken code
       via  895bc9a7c2a ctdb-recoverd: Drop unnecessary code
       via  a6606369e2c vfs_shadow_copy2: Avoid closing snapsdir twice
       via  a9bf4f90260 winbind: Fix a memleak
      from  e32a1f1bd25 WHATSNEW: Fix release notes.

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


- Log -----------------------------------------------------------------
commit c4938561a97e55efd624694ea55ef7c1a46a350a
Author: Alexander Bokovoy <ab at samba.org>
Date:   Sat Oct 24 16:52:43 2020 +0300

    daemons: report status to systemd even when running in foreground
    
    When systemd launches samba services, the configuration we have in
    systemd service files expects that the main process (/usr/sbin/*)
    would use sd_notify() to report back its status. However, we only use
    sd_notify() when running become_daemon().
    
    As a result, samba/smbd/winbindd/nmbd processes never report back its
    status and the status updates from other childs (smbd, winbindd, etc)
    are not accepted as we now have implied NotifyAccess=main since commit
    d1740fb3d5a72cb49e30b330bb0b01e7ef3e09cc
    
    This leads to a timeout and killing samba process by systemd. Situation
    is reproducible in Fedora 33, for example.
    
    Make sure that we have required status updates for all daemons in case
    we aren't runnning in interactive mode.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14552
    
    Signed-off-by: Alexander Bokovoy <ab at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Oct 26 19:58:18 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 3e27dc4847bd35ca8914be087d5a8ca096510399)
    
    Autobuild-User(v4-13-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-13-test): Tue Oct 27 10:50:29 UTC 2020 on sn-devel-184

commit ff781ba4682ded42142ace6e8634fff57788819e
Author: Björn Jacke <bjacke at samba.org>
Date:   Tue Oct 6 23:05:24 2020 +0200

    docs: fix default value of spoolss:architecture
    
    "Windows x64" is the default here since a couple of years already.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14522
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Oct  6 23:06:50 UTC 2020 on sn-devel-184
    
    (cherry picked from commit c587685dde2448d1f68ada47ce5ad42b02a118ce)

commit 24ae26cb49e63405c0f7bf56ef38fc7988c969a7
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Mon Sep 14 09:45:50 2020 +1000

    provision: BIND 9.17.x is not supported
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Rowland Penny <rpenny at samba.org>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Thu Sep 24 05:55:43 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 1bccc67ce7c6364a95fbfeb095938522671578a8)

commit a831cc5799bac57d5d5b7f6c3327b8c6f27874a4
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Sep 11 12:35:30 2020 +1000

    provision: Add support for BIND 9.16.x
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Rowland Penny <rpenny at samba.org>
    (cherry picked from commit 5b2ccb1c7cad5cded5dad37a18a7d42c1680b2f7)

commit f6b6867d5497d2805346fe28efadb3ba63fc3d97
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Sep 11 12:34:07 2020 +1000

    bind9-dlz: Add support for BIND 9.16.x
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Rowland Penny <rpenny at samba.org>
    (cherry picked from commit ca3c18a236dedfdfbf225dcfcd0418f1634d8759)

commit 345137381553ccdcaf1fd3831049172a4818a5f7
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Mon Sep 14 09:45:04 2020 +1000

    provision: BIND 9.15.x is not supported
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Rowland Penny <rpenny at samba.org>
    (cherry picked from commit 4d09797652059c3ed5b2a4f94f2181ce14d39972)

commit 4e65cc6058e35e8b99c80be839d73dbadfea05c9
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Sep 11 12:26:21 2020 +1000

    provision: Add support for BIND 9.14.x
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Rowland Penny <rpenny at samba.org>
    (cherry picked from commit 016c1174ef783990f93e348ee82f5c989c43cbbf)

commit 63d94da74a6592a8e465dda4c3b85c9024d9af46
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Sep 11 12:24:51 2020 +1000

    bind9-dlz: Add support for BIND 9.14.x
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Rowland Penny <rpenny at samba.org>
    (cherry picked from commit a167a2154d4909e8e1f97d9f36d0e4c947f2d944)

commit b5bc60e77d393b7deb55ba64f519ce91cd0cc265
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Mon Sep 14 09:44:10 2020 +1000

    provision: BIND 9.13.x is not supported
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Rowland Penny <rpenny at samba.org>
    (cherry picked from commit 95278618829227632b2bcb29fc272e600607ea41)

commit 8e2ef3cda23b5d7988533ec37d25ecc7fe27efb9
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Sep 11 12:16:01 2020 +1000

    bind9-dlz: Bind 9.13.x switched to using bool as isc_boolean_t instead of int.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14487
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Rowland Penny <rpenny at samba.org>
    (cherry picked from commit cdb6c5d1eca1c0f6967941dbd1da07be6b53d302)

commit 61cd114be10cf5aefb8be051733fd8bfc1e18c90
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Oct 23 08:57:12 2020 +0200

    examples:auth: Do not install example plugin
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14550
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Oct 23 15:32:08 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 3b5b23ea848d82ec0a6d01d4e1cbb62c4c3cbb3b)

commit b5b7a958ef6d44f6970d4d4f125cb4317f2573ce
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Oct 23 08:53:43 2020 +0200

    s3:modules: Do not install vfs modules only used for testing
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14550
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit 6e25613a3141000ac1b7e8edb146dfc320972e8b)

commit cfd5b368d424003fbf43cbe1b052e6675ee594ce
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Oct 22 17:41:01 2020 +0200

    unittests: Mark test binaries for selftest
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14550
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit 2d89ddb012d1d84871da10a61a0449f88d4eba5e)

commit a4c241736bc6c1f1ab420a2f0c48dc6af9221777
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Oct 22 17:40:01 2020 +0200

    buildtools: Do not install binaries which are for selftest
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14550
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit 8fa0d3331b2b2c450d86bffec0a6f39320fcb8c0)

commit fe28ffc4a7efe19f1c2f5587d976b00ea7c9a50f
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Oct 22 11:08:19 2020 +0200

    s3:script: Fix test_dfree_quota.sh
    
    source3/script/tests/test_dfree_quota.sh: line 200: [: missing `]'
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14550
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit 9bc9f8ce66ef02d7d77cfd31dc2a72102d546d75)

commit d76e1b43e2d1ca23028697bdb9d9a98a4d6e8993
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Aug 25 17:39:18 2020 +0200

    third_party: Update resolv_wrapper to version 1.1.7
    
    This fixes some Samba tests which redirect stderr to stdout and then get
    more messages than expected.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14547
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    (cherry picked from commit fbe58531a20cbbe0906f13e370329f3030d4ce96)

commit 995478c937824801fca8494f81fbe3b478ef4e8a
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 21 19:14:32 2020 +0200

    testprogs: Fix and improve upgradeprovision-oldrelease test
    
    This fixes running `make test` in a release tarball!
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu Oct 22 17:28:39 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 1432d225b0426e366649cde4837eff58ee95b0c8)

commit e51a5e8aea40b2d61956126a5d73cb9b49ae3c64
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 21 18:03:25 2020 +0200

    testprogs: Fix and improve dbcheck-oldrelease test
    
    This fixes running `make test` in a release tarball!
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit 32305d607f43a84fa862f9f97c0dc1ea51b45ab7)

commit 7357ddefe33b299caa706899b2e463a9c5c296e2
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 21 17:54:54 2020 +0200

    testprogs: Fix and improve functionalprep test
    
    This fixes running `make test` in a release tarball!
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit 28720d66df017bfaadd44378dfffaaab4e30cf22)

commit 7b2c975a88be98ae09474316001ac1cc5ae88893
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 21 17:41:27 2020 +0200

    testprogs: Fix and improve dbcheck-links test
    
    This fixes running `make test` in a release tarball!
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit d8fe4315c85811ef3c5a1cfa42bf416bc1c8109e)

commit 2aad79378ad8aec28026649157bad4c229ab22c0
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 21 17:35:34 2020 +0200

    testprogs: Fix and improve runtime-links test
    
    This fixes running `make test` in a release tarball!
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit a9765084f11eae991516f150d1cd1c2370854ec7)

commit 62e97089a880a613cbb9bfd038e276390fe6dda6
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 21 17:04:12 2020 +0200

    testprogs: Fix and improve tombstones-expunge test
    
    This fixes running `make test` in a release tarball!
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit e4194355f4c346179ceafe5086897c0c50c108d6)

commit 33b116da10aa8a79a45f32480277cbc2072242b3
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 20 20:47:43 2020 +0200

    testprogs: Fix and improve demote-saveddb test
    
    This fixes running `make test` in a release tarball!
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit e58ccdaa1a1e5943aa02ecba88d1de0323777041)

commit daeada8e48ea426288eb55187e3ff200bb81f145
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Oct 22 11:39:04 2020 +0200

    testprogs: Add remove_directory to common test functions
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit 3770f28c6289a9328b81968a4548bfaeb8bd40aa)

commit 069c5acc4b69d49ead2c2bb4b014905d43415d90
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Oct 21 07:43:08 2020 +0200

    python: Create targetdir recursively
    
    This fixes `make test` in a release tarball.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    (cherry picked from commit 76db796181419967a483bcd71fe0cca313ccaf82)

commit 15e15f7c21b1c0b19773f714602a38a2237f3cc2
Author: Khem Raj <raj.khem at gmail.com>
Date:   Wed Jul 22 22:42:09 2020 -0700

    nsswitch/nsstest.c: Avoid nss function conflicts with glibc nss.h
    
    glibc 2.32 will define these varibles [1] which results in conflicts
    with these static function names, therefore prefix these function names
    with samba_ to avoid it
    
    [1] https://sourceware.org/git/?p=glibc.git;a=commit;h=499a92df8b9fc64a054cf3b7f728f8967fc1da7d
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Noel Power <npower at samba.org>
    
    Autobuild-User(master): Noel Power <npower at samba.org>
    Autobuild-Date(master): Tue Jul 28 10:52:00 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 6e496aa3635557b59792e469f7c7f8eccd822322)

commit b15f35b573817b0e39425ae05962a9b1028bdc32
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Oct 13 12:43:39 2020 +0200

    s4:dsdb:acl_read: Implement "List Object" mode feature
    
    See [MS-ADTS] 5.1.3.3.6 Checking Object Visibility
    
    I tried to avoid any possible overhead for the common cases:
    
    - SEC_ADS_LIST (List Children) is already granted by default
    - fDoListObject is off by default
    
    Overhead is only added if the administrator turned on
    the fDoListObject feature and removed SEC_ADS_LIST (List Children)
    from a parent object.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14531
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Wed Oct 21 08:48:02 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 7223f6453b1b38c933c9480c637ffd06d9f39b97)

commit 0918966f9d5673112a913d3be2b4cb8320be6b27
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Oct 6 11:21:34 2020 +0200

    s4:dsdb:util: add dsdb_do_list_object() helper
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14531
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    (cherry picked from commit ffc0bdc6d49e88da1ee408956365da163ff3e1b2)

commit 160a2d6a5f9e3c1b57cef26937a2de5ecb9877a4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 12 17:59:34 2020 +0200

    s4:dsdb:acl_read: defer LDB_ERR_NO_SUCH_OBJECT
    
    We may need to return child objects even if the base dn
    is invisible.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14531
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    (cherry picked from commit e1529bedb2b6c8553e69a42537ac0cffd03af6d6)

commit ee5b2e3be9063f787c7302100ce04fba4f5fe3f5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Oct 6 15:10:33 2020 +0200

    s4:dsdb:acl_read: make use of aclread_check_object_visible() for the search base
    
    We should only have one place to do access checks.
    
    Use 'git show -w' to see the minimal diff.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14531
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    (cherry picked from commit faff8e6c89777c38443e561235073c336cfb2e9c)

commit 24e0a440a9331f676cdeabf38f307fec281c86f3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Oct 6 15:10:33 2020 +0200

    s4:dsdb:acl_read: fully set up 'struct aclread_context' before the search base acl check
    
    This makes further change much easier.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14531
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    (cherry picked from commit c4a3028de726d6708f57d02f9162a4d62d1b6ae7)

commit 540cd43baf2b761dbed17cd7e817b312cf31b96e
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Oct 6 15:07:19 2020 +0200

    s4:dsdb:acl_read: introduce aclread_check_object_visible() helper
    
    In future this will do more than aclread_check_parent(),
    if we implement fDoListObject and SEC_ADS_LIST_OBJECT handling.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14531
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    (cherry picked from commit d2dd7c2a5c1f8ee30f0f3b41f933d082b0c75f7c)

commit f92b61ec8265f9008950eeea6200c3d38f07fbfd
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Oct 7 13:21:06 2020 +0200

    s4:dsdb:tests: add AclVisibiltyTests
    
    This tests a sorts of combinations in order to
    demonstrate the visibility of objects depending on:
    
    - with or without fDoListObject
    - with or without explicit DENY ACEs
    - A hierachy of objects with 4 levels from the base dn
    - SEC_ADS_LIST (List Children)
    - SEC_ADS_LIST_LIST_OBJECT (List Object)
    - SEC_ADS_READ_PROP
    - all possible scopes and basedns
    
    This demonstrates that NO_SUCH_OBJECT doesn't depend purely
    on the visibility of the base dn, it's still possible to
    get children returned und an invisible base dn.
    
    It also demonstrates the additional behavior with "List Object" mode.
    See [MS-ADTS] 5.1.3.3.6 Checking Object Visibility
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14531
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    (cherry picked from commit 06d134406739e76b97273db3023855150dbaebbc)

commit a89a78aa609115a770113d2d23e99ad7e3172b54
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Apr 20 20:00:51 2020 +0200

    python/tests: add DynamicTestCase setUpDynamicTestCases() infrastructure
    
    This can be used in order to run a sepcific test (coded just once)
    with an autogenerated set of arguments.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14531
    
    Pair-Programmed-With: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    (cherry picked from commit 80347deb544b38be6c6814e5d1b82e48ebe83fd1)

commit e759ecdae11aff98847236cab46dd26fbb7ba90b
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Sep 30 10:48:38 2020 +1000

    ctdb-tests: Strengthen node state checking in ctdb disable/enable test
    
    Check that the desired state is set on all nodes instead of just the
    test node.  This ensures that node flags have correctly propagated
    across the cluster.
    
    RN: Fix remaining ctdb disable/enable bug
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14513
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Tue Oct  6 04:32:06 UTC 2020 on sn-devel-184
    
    (cherry picked from commit b68105b8f7c20692d23d457f2777edcf44f12bb8)
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit 710b287bdc99eb40b31eed6f952d9cd83f7e64a3
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Jan 16 15:15:51 2018 +1100

    ctdb-recoverd: Drop unnecessary and broken code
    
    update_flags() has already updated the recovery master's canonical
    node map, based on the flags from each remote node, and pushed out
    these flags to all nodes.
    
    If i == j then the node map has already been updated from this remote
    node's flags, so simply drop this case.
    
    Although update_flags() has updated flags for all nodes, it did not
    update each node map in remote_nodemaps[] to reflect this.  This means
    that remote_nodemaps[] may contain inconsistent flags for some nodes
    so it should not be used to check consistency when i != j.
    
    Further, a meaningful difference in flags can only really occur if
    update_flags() failed.  In that case this code is never reached.
    
    These observations combine to imply that this whole loop should be
    dropped.
    
    This leaves potential sub-second inconsistencies due to out-of-band
    healthy/unhealthy flag changes pushed via CTDB_SRVID_PUSH_NODE_FLAGS.
    These updates could be dropped (takeover run asks each node for
    available IPs rather than making centralised decisions based on node
    flags) but for now they will be fixed in the next iteration of
    main_loop().
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14513
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    (cherry picked from commit 4b01f54041dee469971f244e64064eed46de2ed5)

commit 895bc9a7c2aa6fab2029618d1267d97f705c4b1b
Author: Martin Schwenke <martin at meltin.net>
Date:   Fri Jan 19 14:55:21 2018 +1100

    ctdb-recoverd: Drop unnecessary code
    
    This has already been done in update_flags().
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14513
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    (cherry picked from commit 3ab52b528673e08caa66f00e963528c591a84fe1)

commit a6606369e2ce672b3d22b74cf26b606e0026af76
Author: Anoop C S <anoopcs at samba.org>
Date:   Mon Oct 12 16:55:40 2020 +0530

    vfs_shadow_copy2: Avoid closing snapsdir twice
    
    As per man page for closedir(3):
    
    . . .
    The  closedir() function closes the directory stream associated with
    dirp.  A successful call to closedir() also closes the underlying file
    descriptor associated with dirp.
    . . .
    
    Therefore we don't have to attempt an additional close of file
    descriptor after closedir().
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14530
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Signed-off-by: Anoop C S <anoopcs at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Wed Oct 14 10:08:24 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 74fbe0b987a0333cca28bb6a547e5b4b4f2e706d)

commit a9bf4f90260cbeb679849c12477b00fd5a606a86
Author: Laurent Menase <laurent.menase at hpe.com>
Date:   Wed May 20 12:31:53 2020 +0200

    winbind: Fix a memleak
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=14388
    Signed-off-by: Laurent Menase <laurent.menase at hpe.com>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Noel Power <noel.power at suse.com>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Mon Sep 14 13:33:13 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 8f868b0ea0b4795668f7bc0b028cd85686b249fb)

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

Summary of changes:
 buildtools/wafsamba/samba_third_party.py           |   2 +-
 buildtools/wafsamba/wafsamba.py                    |   6 +-
 ctdb/server/ctdb_recoverd.c                        |  61 ----
 .../failover/pubips.030.disable_enable.sh          |   4 +-
 .../smbdotconf/printing/spoolssarchitecture.xml    |   4 +-
 examples/auth/wscript_build                        |   3 +-
 nsswitch/nsstest.c                                 |  16 +-
 python/samba/netcmd/domain.py                      |   2 +-
 python/samba/provision/sambadns.py                 |  17 +-
 python/samba/tests/__init__.py                     |  27 ++
 source3/modules/vfs_shadow_copy2.c                 |   7 +
 source3/modules/wscript_build                      |  12 +-
 source3/nmbd/nmbd.c                                |   4 +-
 source3/script/tests/test_dfree_quota.sh           |   2 +-
 source3/smbd/server.c                              |   4 +-
 source3/winbindd/winbindd.c                        |   5 +-
 source3/winbindd/winbindd_ads.c                    |   1 +
 source4/dns_server/dlz_minimal.h                   |  24 +-
 source4/dns_server/wscript_build                   |  20 ++
 source4/dsdb/samdb/ldb_modules/acl_read.c          | 185 +++++++++---
 source4/dsdb/samdb/ldb_modules/util.c              |  21 ++
 source4/dsdb/tests/python/acl.py                   | 321 ++++++++++++++++++++-
 source4/selftest/tests.py                          |   2 +-
 source4/setup/named.conf.dlz                       |   6 +
 source4/smbd/server.c                              |   4 +-
 testprogs/blackbox/common-links.sh                 |  16 +-
 testprogs/blackbox/common_test_fns.inc             |  11 +
 testprogs/blackbox/dbcheck-links.sh                | 160 +++++-----
 testprogs/blackbox/dbcheck-oldrelease.sh           | 240 +++++++--------
 testprogs/blackbox/demote-saveddb.sh               |  75 +++--
 testprogs/blackbox/functionalprep.sh               |  77 ++---
 testprogs/blackbox/runtime-links.sh                |  65 +++--
 testprogs/blackbox/tombstones-expunge.sh           |  94 +++---
 testprogs/blackbox/upgradeprovision-oldrelease.sh  | 254 ++++++++--------
 testsuite/unittests/wscript                        |   6 +-
 third_party/resolv_wrapper/resolv_wrapper.c        |   4 +-
 third_party/resolv_wrapper/wscript                 |   2 +-
 37 files changed, 1152 insertions(+), 612 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py
index 318da4f4eff..bc2b21f2a55 100644
--- a/buildtools/wafsamba/samba_third_party.py
+++ b/buildtools/wafsamba/samba_third_party.py
@@ -34,7 +34,7 @@ Build.BuildContext.CHECK_NSS_WRAPPER = CHECK_NSS_WRAPPER
 
 @conf
 def CHECK_RESOLV_WRAPPER(conf):
-    return conf.CHECK_BUNDLED_SYSTEM_PKG('resolv_wrapper', minversion='1.1.6')
+    return conf.CHECK_BUNDLED_SYSTEM_PKG('resolv_wrapper', minversion='1.1.7')
 Build.BuildContext.CHECK_RESOLV_WRAPPER = CHECK_RESOLV_WRAPPER
 
 @conf
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 7827d374654..25fed671e5b 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -365,8 +365,10 @@ def SAMBA_BINARY(bld, binname, source,
                  for_selftest=False):
     '''define a Samba binary'''
 
-    if for_selftest and not bld.CONFIG_GET('ENABLE_SELFTEST'):
-        enabled=False
+    if for_selftest:
+        install=False
+        if not bld.CONFIG_GET('ENABLE_SELFTEST'):
+            enabled=False
 
     if not enabled:
         SET_TARGET_TYPE(bld, binname, 'DISABLED')
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index f825427e7a3..856fcbb72c8 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -2667,67 +2667,6 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
 		}
 	}
 
-	/*
-	 * Update node flags obtained from each active node. This ensure we have
-	 * up-to-date information for all the nodes.
-	 */
-	for (j=0; j<nodemap->num; j++) {
-		if (nodemap->nodes[j].pnn == ctdb->pnn) {
-			continue;
-		}
-		if (nodemap->nodes[j].flags & NODE_FLAGS_INACTIVE) {
-			continue;
-		}
-		nodemap->nodes[j].flags = remote_nodemaps[j]->nodes[j].flags;
-	}
-
-	for (j=0; j<nodemap->num; j++) {
-		if (nodemap->nodes[j].pnn == ctdb->pnn) {
-			continue;
-		}
-		if (nodemap->nodes[j].flags & NODE_FLAGS_INACTIVE) {
-			continue;
-		}
-
-		/* verify the flags are consistent
-		*/
-		for (i=0; i<nodemap->num; i++) {
-			if (nodemap->nodes[i].flags & NODE_FLAGS_DISCONNECTED) {
-				continue;
-			}
-			
-			if (nodemap->nodes[i].flags != remote_nodemaps[j]->nodes[i].flags) {
-				DEBUG(DEBUG_ERR, (__location__ " Remote node:%u has different flags for node %u. It has 0x%02x vs our 0x%02x\n", 
-				  nodemap->nodes[j].pnn, 
-				  nodemap->nodes[i].pnn, 
-				  remote_nodemaps[j]->nodes[i].flags,
-				  nodemap->nodes[i].flags));
-				if (i == j) {
-					DEBUG(DEBUG_ERR,("Use flags 0x%02x from remote node %d for cluster update of its own flags\n", remote_nodemaps[j]->nodes[i].flags, j));
-					update_flags_on_all_nodes(
-					    rec,
-					    nodemap->nodes[i].pnn,
-					    remote_nodemaps[j]->nodes[i].flags);
-					ctdb_set_culprit(rec, nodemap->nodes[j].pnn);
-					do_recovery(rec, mem_ctx, pnn, nodemap, 
-						    vnnmap);
-					return;
-				} else {
-					DEBUG(DEBUG_ERR,("Use flags 0x%02x from local recmaster node for cluster update of node %d flags\n", nodemap->nodes[i].flags, i));
-					update_flags_on_all_nodes(
-						rec,
-						nodemap->nodes[i].pnn,
-						nodemap->nodes[i].flags);
-					ctdb_set_culprit(rec, nodemap->nodes[j].pnn);
-					do_recovery(rec, mem_ctx, pnn, nodemap, 
-						    vnnmap);
-					return;
-				}
-			}
-		}
-	}
-
-
 	/* count how many active nodes there are */
 	num_lmasters  = 0;
 	for (i=0; i<nodemap->num; i++) {
diff --git a/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh b/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh
index c0bb62d1991..0b8425b2556 100755
--- a/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh
+++ b/ctdb/tests/INTEGRATION/failover/pubips.030.disable_enable.sh
@@ -21,10 +21,10 @@ select_test_node_and_ips
 
 echo "Disabling node $test_node"
 try_command_on_node 1 $CTDB disable -n $test_node
-wait_until_node_has_status $test_node disabled
+wait_until_node_has_status $test_node disabled 30 all
 wait_until_node_has_no_ips "$test_node"
 
 echo "Re-enabling node $test_node"
 try_command_on_node 1 $CTDB enable -n $test_node
-wait_until_node_has_status $test_node enabled
+wait_until_node_has_status $test_node enabled 30 all
 wait_until_node_has_some_ips "$test_node"
diff --git a/docs-xml/smbdotconf/printing/spoolssarchitecture.xml b/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
index 1eccf9f58cf..dae73905663 100644
--- a/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
+++ b/docs-xml/smbdotconf/printing/spoolssarchitecture.xml
@@ -8,6 +8,6 @@
 	architecture. Samba's spoolss print server architecture can be changed using
 	this parameter.</para>
 </description>
-<value type="default">Windows NT x86</value>
-<value type="example">Windows x64</value>
+<value type="default">Windows x64</value>
+<value type="example">Windows NT x86</value>
 </samba:parameter>
diff --git a/examples/auth/wscript_build b/examples/auth/wscript_build
index 91f5302918b..03221238e5f 100644
--- a/examples/auth/wscript_build
+++ b/examples/auth/wscript_build
@@ -6,4 +6,5 @@ bld.SAMBA3_MODULE('auth_skel',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_skel'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_skel'))
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_skel'),
+                 install=False)
diff --git a/nsswitch/nsstest.c b/nsswitch/nsstest.c
index e8c4306441d..e2ee9fbf3af 100644
--- a/nsswitch/nsstest.c
+++ b/nsswitch/nsstest.c
@@ -137,7 +137,7 @@ static struct passwd *nss_getpwuid(uid_t uid)
 	return &pwd;
 }
 
-static void nss_setpwent(void)
+static void samba_nss_setpwent(void)
 {
 	NSS_STATUS (*_nss_setpwent)(void) =
 		(NSS_STATUS(*)(void))find_fn("setpwent");
@@ -152,7 +152,7 @@ static void nss_setpwent(void)
 	}
 }
 
-static void nss_endpwent(void)
+static void samba_nss_endpwent(void)
 {
 	NSS_STATUS (*_nss_endpwent)(void) =
 		(NSS_STATUS (*)(void))find_fn("endpwent");
@@ -290,7 +290,7 @@ again:
 	return &grp;
 }
 
-static void nss_setgrent(void)
+static void samba_nss_setgrent(void)
 {
 	NSS_STATUS (*_nss_setgrent)(void) =
 		(NSS_STATUS (*)(void))find_fn("setgrent");
@@ -305,7 +305,7 @@ static void nss_setgrent(void)
 	}
 }
 
-static void nss_endgrent(void)
+static void samba_nss_endgrent(void)
 {
 	NSS_STATUS (*_nss_endgrent)(void) =
 		(NSS_STATUS (*)(void))find_fn("endgrent");
@@ -402,7 +402,7 @@ static void nss_test_users(void)
 {
 	struct passwd *pwd;
 
-	nss_setpwent();
+	samba_nss_setpwent();
 	/* loop over all users */
 	while ((pwd = nss_getpwent())) {
 		printf("Testing user %s\n", pwd->pw_name);
@@ -424,14 +424,14 @@ static void nss_test_users(void)
 		printf("initgroups: "); nss_test_initgroups(pwd->pw_name, pwd->pw_gid);
 		printf("\n");
 	}
-	nss_endpwent();
+	samba_nss_endpwent();
 }
 
 static void nss_test_groups(void)
 {
 	struct group *grp;
 
-	nss_setgrent();
+	samba_nss_setgrent();
 	/* loop over all groups */
 	while ((grp = nss_getgrent())) {
 		printf("Testing group %s\n", grp->gr_name);
@@ -452,7 +452,7 @@ static void nss_test_groups(void)
 		printf("getgrgid: "); print_group(grp);
 		printf("\n");
 	}
-	nss_endgrent();
+	samba_nss_endgrent();
 }
 
 static void nss_test_errors(void)
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 4cb873fd634..1d12c362911 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -445,7 +445,7 @@ class cmd_domain_provision(Command):
 
         if targetdir is not None:
             if not os.path.isdir(targetdir):
-                os.mkdir(targetdir)
+                os.makedirs(targetdir)
 
         eadb = True
 
diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index ffdb2559979..4aa132abfa6 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -962,6 +962,8 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
         bind9_10 = '#'
         bind9_11 = '#'
         bind9_12 = '#'
+        bind9_14 = '#'
+        bind9_16 = '#'
         if bind_info.upper().find('BIND 9.8') != -1:
             bind9_8 = ''
         elif bind_info.upper().find('BIND 9.9') != -1:
@@ -972,8 +974,18 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
             bind9_11 = ''
         elif bind_info.upper().find('BIND 9.12') != -1:
             bind9_12 = ''
+        elif bind_info.upper().find('BIND 9.14') != -1:
+            bind9_14 = ''
+        elif bind_info.upper().find('BIND 9.16') != -1:
+            bind9_16 = ''
         elif bind_info.upper().find('BIND 9.7') != -1:
             raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
+        elif bind_info.upper().find('BIND_9.13') != -1:
+            raise ProvisioningError("Only stable/esv releases of BIND are supported.")
+        elif bind_info.upper().find('BIND_9.15') != -1:
+            raise ProvisioningError("Only stable/esv releases of BIND are supported.")
+        elif bind_info.upper().find('BIND_9.17') != -1:
+            raise ProvisioningError("Only stable/esv releases of BIND are supported.")
         else:
             logger.warning("BIND version unknown, please modify %s manually." % paths.namedconf)
         setup_file(setup_path("named.conf.dlz"), paths.namedconf, {
@@ -983,8 +995,9 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
                     "BIND9_9": bind9_9,
                     "BIND9_10": bind9_10,
                     "BIND9_11": bind9_11,
-                    "BIND9_12": bind9_12
-
+                    "BIND9_12": bind9_12,
+                    "BIND9_14": bind9_14,
+                    "BIND9_16": bind9_16
                     })
 
 
diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index e7979a7e3ab..38f65f17e35 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -63,10 +63,37 @@ BINDIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
 
 HEXDUMP_FILTER = bytearray([x if ((len(repr(chr(x))) == 3) and (x < 127)) else ord('.') for x in range(256)])
 
+def DynamicTestCase(cls):
+    cls.setUpDynamicTestCases()
+    return cls
 
 class TestCase(unittest.TestCase):
     """A Samba test case."""
 
+    @classmethod
+    def generate_dynamic_test(cls, fnname, suffix, *args):
+        """
+        fnname is something like "test_dynamic_sum"
+        suffix is something like "1plus2"
+        argstr could be (1, 2)
+
+        This would generate a test case called
+        "test_dynamic_sum_1plus2(self)" that
+        calls
+        self._test_dynamic_sum_with_args(1, 2)
+        """
+        def fn(self):
+            getattr(self, "_%s_with_args" % fnname)(*args)
+        setattr(cls, "%s_%s" % (fnname, suffix), fn)
+
+    @classmethod
+    def setUpDynamicTestCases(cls):
+        """This can be implemented in order to call cls.generate_dynamic_test()
+        In order to implement autogenerated testcase permutations.
+        """
+        msg = "%s needs setUpDynamicTestCases() if @DynamicTestCase is used!" % (cls)
+        raise Exception(msg)
+
     def setUp(self):
         super(TestCase, self).setUp()
         test_debug_level = os.getenv("TEST_DEBUG_LEVEL")
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 3be93f985dd..8ccc4dd77ec 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -2116,6 +2116,13 @@ done:
 	if (p != NULL) {
 		SMB_VFS_NEXT_CLOSEDIR(handle, p);
 		p = NULL;
+		if (dirfsp != NULL) {
+			/*
+			 * VFS_CLOSEDIR implicitly
+			 * closed the associated fd.
+			 */
+			dirfsp->fh->fd = -1;
+		}
 	}
 	if (dirfsp != NULL) {
 		fd_close(dirfsp);
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 09528f38070..bdff7fda7b8 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -114,7 +114,8 @@ bld.SAMBA3_MODULE('vfs_fake_acls',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_acls'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_acls'))
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_acls'),
+                 install=False)
 
 bld.SAMBA3_MODULE('vfs_recycle',
                  subsystem='vfs',
@@ -610,21 +611,24 @@ bld.SAMBA3_MODULE('vfs_fake_dfq',
                  source='vfs_fake_dfq.c',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_dfq'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_dfq'))
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_dfq'),
+                 install=False)
 
 bld.SAMBA3_MODULE('vfs_error_inject',
                  subsystem='vfs',
                  source='vfs_error_inject.c',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_error_inject'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_error_inject'))
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_error_inject'),
+                 install=False)
 
 bld.SAMBA3_MODULE('vfs_delay_inject',
                  subsystem='vfs',
                  source='vfs_delay_inject.c',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_delay_inject'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_delay_inject'))
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_delay_inject'),
+                 install=False)
 
 bld.SAMBA3_MODULE('vfs_widelinks',
                  subsystem='vfs',
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 0b881d13f7b..f6aeba1f714 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -1009,6 +1009,8 @@ static bool open_sockets(bool isdaemon, int port)
 	if (is_daemon && !opt_interactive) {
 		DEBUG(3, ("Becoming a daemon.\n"));
 		become_daemon(Fork, no_process_group, log_stdout);
+	} else if (!opt_interactive) {
+		daemon_status("nmbd", "Starting process...");
 	}
 
 #ifdef HAVE_SETPGID
@@ -1135,7 +1137,7 @@ static bool open_sockets(bool isdaemon, int port)
 		exit_daemon( "NMBD failed to setup packet server.", EACCES);
 	}
 
-	if (is_daemon && !opt_interactive) {
+	if (!opt_interactive) {
 		daemon_ready("nmbd");
 	}
 
diff --git a/source3/script/tests/test_dfree_quota.sh b/source3/script/tests/test_dfree_quota.sh
index e86d431180a..a1403a8c4ba 100755
--- a/source3/script/tests/test_dfree_quota.sh
+++ b/source3/script/tests/test_dfree_quota.sh
@@ -197,7 +197,7 @@ test_smbcquotas() {
 	return $status
 }
 
-if [ $protocol != "SMB3" -a $protocol != "NT1"]; then
+if [ $protocol != "SMB3" ] && [ $protocol != "NT1" ]; then
 	echo "unsupported protocol $protocol" | subunit_fail_test "Test dfree quota"
 	failed=`expr $failed + 1`
 fi
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 3347519ea4f..39f83c3daa6 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1889,6 +1889,8 @@ extern void build_options(bool screen);
 	if (is_daemon && !interactive) {
 		DEBUG(3, ("Becoming a daemon.\n"));
 		become_daemon(Fork, no_process_group, log_stdout);
+	} else {
+		daemon_status("smbd", "Starting process ...");
 	}
 
 #ifdef HAVE_SETPGID
@@ -2096,7 +2098,7 @@ extern void build_options(bool screen);
 		exit_daemon("Samba cannot setup ep pipe", EACCES);
 	}
 
-	if (is_daemon && !interactive) {
+	if (!interactive) {
 		daemon_ready("smbd");
 	}
 
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 4397a1bc0d1..1e08237905a 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1880,8 +1880,11 @@ int main(int argc, const char **argv)
 	BlockSignals(False, SIGHUP);
 	BlockSignals(False, SIGCHLD);
 
-	if (!interactive)
+	if (!interactive) {
 		become_daemon(Fork, no_process_group, log_stdout);
+	} else {
+		daemon_status("winbindd", "Starting process ...");
+	}
 
 	pidfile_create(lp_pid_directory(), "winbindd");
 
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 20f47eb5954..6a9d1234f40 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -405,6 +405,7 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 	DBG_NOTICE("ads query_user_list gave %d entries\n", count);
 
 done:
+	ads_msgfree(ads, res);
 	return status;
 }
 
diff --git a/source4/dns_server/dlz_minimal.h b/source4/dns_server/dlz_minimal.h
index 193904f4b2c..d991528d6ad 100644
--- a/source4/dns_server/dlz_minimal.h
+++ b/source4/dns_server/dlz_minimal.h
@@ -23,30 +23,47 @@
 #ifndef DLZ_MINIMAL_H
 #define DLZ_MINIMAL_H 1
 
+#include <stdint.h>
+#include <stdbool.h>
+
 #if defined (BIND_VERSION_9_8)
 # define DLZ_DLOPEN_VERSION 1
 #elif defined (BIND_VERSION_9_9)
 # define DLZ_DLOPEN_VERSION 2
 # define DNS_CLIENTINFO_VERSION 1
+# define ISC_BOOLEAN_AS_BOOL 0
 #elif defined (BIND_VERSION_9_10)
 # define DLZ_DLOPEN_VERSION 3
 # define DNS_CLIENTINFO_VERSION 1
+# define ISC_BOOLEAN_AS_BOOL 0
 #elif defined (BIND_VERSION_9_11)
 # define DLZ_DLOPEN_VERSION 3
 # define DNS_CLIENTINFO_VERSION 2
+# define ISC_BOOLEAN_AS_BOOL 0
 #elif defined (BIND_VERSION_9_12)
 # define DLZ_DLOPEN_VERSION 3
 # define DNS_CLIENTINFO_VERSION 2
+# define ISC_BOOLEAN_AS_BOOL 0
+#elif defined (BIND_VERSION_9_14)
+# define DLZ_DLOPEN_VERSION 3
+# define DNS_CLIENTINFO_VERSION 2
+#elif defined (BIND_VERSION_9_16)
+# define DLZ_DLOPEN_VERSION 3
+# define DNS_CLIENTINFO_VERSION 2
 #else
 # error Unsupported BIND version


-- 
Samba Shared Repository



More information about the samba-cvs mailing list