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

Karolin Seeger kseeger at samba.org
Wed Feb 19 07:53:06 UTC 2020


The branch, v4-12-test has been updated
       via  19d74ce5f5b WHATSNEW.txt update explaining SMB_VFS_CREATE_DFS_PATHAT() / SMB_VFS_READ_DFS_PATHAT().
       via  6c886973fa0 s3: DFS: Remove is_msdfs_link_internal() - no longer used.
       via  bbbfc6b8acd s3: DFS: Change the last use of is_msdfs_link_internal() -> SMB_VFS_READ_DFS_PATHAT() inside form_junctions().
       via  8690880313a s3: DFS: Replace calls to is_msdfs_link_internal() inside dfs_path_lookup() with SMB_VFS_READ_DFS_PATHAT().
       via  92722a1b63a s3: DFS: Change dfs_path_lookup() to return struct referral list and count directly.
       via  007c96ab6e2 s3: DFS: Parse the returned target path in dfs_path_lookup().
       via  967e0e15fc9 s3: DFS: Change simple is_msdfs_link() call to use SMB_VFS_READ_DFS_PATHAT().
       via  ce94b410867 s3: VFS: vfs_time_audit: Add read_dfs_pathat().
       via  2633e182133 s3: VFS: vfs_full_audit: Add read_dfs_pathat().
       via  dfabe8e731e s3: VFS: catia: Add read_dfs_pathat().
       via  895c06ccec2 s3: VFS: cap: Add cap_read_dfs_pathat().
       via  13c6e747da1 s3: VFS: shadow_copy2: Add shadow_copy2_read_dfs_pathat().
       via  5c8f5a48df7 s3: VFS: gluster: Add vfs_gluster_read_dfs_pathat().
       via  7bbfc1c3a8c s3: VFS: ceph: Add vfswrap_ceph_read_dfs_pathat().
       via  6fae0415d55 s3: VFS: Add SMB_VFS_READ_DFS_PATHAT().
       via  6d5220f23cf s3: smbd: dfs: Clean up exits / talloc heirarchy in parse_msdfs_symlink().
       via  b4285b8d1b1 s3: smbd: dfs: Make parameter names consistent.
       via  c13c6e44918 s3: smbd: dfs: Allow parse_msdfs_symlink() to be called with NULL pointers.
       via  2f2794a7241 s3: smbd: dfs: Apply some README.Coding to parse_msdfs_symlink().
       via  9f87784686d s3: smbd: dfs: Make parse_msdfs_symlink() external.
       via  3ff14a2e5a3 s3: smbd: dfs: Move lp_msdfs_shuffle_referrals() call out of parse_msdfs_symlink().
       via  7f034780869 s3: smbd: dfs: Cleanup, reformat calls to parse_msdfs_symlink()
       via  1ba9c318ae1 s3: VFS: Implement create_dfs_pathat() in cap
       via  ce3bf591e2f s3: VFS: Implement create_dfs_pathat() in catia.
       via  59815861b2e WHATSNEW: announce vfs_io_uring
       via  a1486fb2837 s3:modules: add vfs_io_uring module
       via  ac78557df8e bootstrap: replace libaio-dev/libaio-devel with liburing-dev/liburing-devel
       via  40c84bfcdd2 lib/replace: remove unused check for aio.h
       via  9463a387831 lib: Fix a shutdown crash with "clustering = yes"
       via  fd63e94a282 lib: Introduce messaging_context->per_process_talloc_ctx
       via  1b4db22b160 lib: Add a TALLOC_CTX to base register_msg_pool_usage() on
       via  60deff09d09 lib: Simplify register_msg_pool_usage()
      from  46ff9e1bca8 auth: Fix CID 1458418 Null pointer dereferences (REVERSE_INULL)

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


- Log -----------------------------------------------------------------
commit 19d74ce5f5b649d7f75c18f4430331c948d7e96c
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 18 16:23:22 2020 -0800

    WHATSNEW.txt update explaining SMB_VFS_CREATE_DFS_PATHAT() / SMB_VFS_READ_DFS_PATHAT().
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(v4-12-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-12-test): Wed Feb 19 07:52:15 UTC 2020 on sn-devel-184

commit 6c886973fa07f88db0ddd31e0cc28e05ad988000
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 12 13:54:08 2020 -0800

    s3: DFS: Remove is_msdfs_link_internal() - no longer used.
    
    All DFS links are now read through the VFS and not via
    symlink calls.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Tue Feb 18 22:34:16 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 9ee1320049cf148a2bb102bbdee4a4bcc24c0de1)

commit bbbfc6b8acd4187959c1905768f0e05792302091
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 12 13:52:58 2020 -0800

    s3: DFS: Change the last use of is_msdfs_link_internal() -> SMB_VFS_READ_DFS_PATHAT() inside form_junctions().
    
    is_msdfs_link_internal() is no longer used.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 94068b5438013479b0426fea7f83bbd7f8f935e9)

commit 8690880313af37fd4d003f216fa6d16a9ee1ea9e
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 12 13:41:56 2020 -0800

    s3: DFS: Replace calls to is_msdfs_link_internal() inside dfs_path_lookup() with SMB_VFS_READ_DFS_PATHAT().
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 3c77a9e7116bc3f1e3c9bf89c28a32bdb6cdffe1)

commit 92722a1b63a6209516d8d6fd606fde4b8d51e25f
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 12 13:17:51 2020 -0800

    s3: DFS: Change dfs_path_lookup() to return struct referral list and count directly.
    
    Remove external parse of returned link targetpath, expose
    the parsing previously added to dfs_path_lookup().
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 1668c9ee15b421093756ac9d709f55ce3e808791)

commit 007c96ab6e2e9800baa216b29b7fcad8a715a5ef
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 11 14:21:12 2020 -0800

    s3: DFS: Parse the returned target path in dfs_path_lookup().
    
    Currently unused, but this will ease the transition to
    using SMB_VFS_READ_DFS_PATHAT().
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 1ffc52abedae9787f745795a4f502c26b4c005d1)

commit 967e0e15fc92cefe7f8d3c9b1442c391e67e87a5
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 11 13:35:53 2020 -0800

    s3: DFS: Change simple is_msdfs_link() call to use SMB_VFS_READ_DFS_PATHAT().
    
    This will need an extra dirfsp parameter in future, but this
    is the easiest change for now.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 07a3cd56cddfc0e27a75ca76e556e2fdb18c3291)

commit ce94b410867446b997952c368664b5d5cdc36573
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 14 13:08:04 2020 -0800

    s3: VFS: vfs_time_audit: Add read_dfs_pathat().
    
    Not yet used.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 0528584482f798753d636675da778917f50ca845)

commit 2633e1821339590b849360737060fb67c064eb48
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 11 10:02:18 2020 -0800

    s3: VFS: vfs_full_audit: Add read_dfs_pathat().
    
    Not yet used.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 263df988831a40ba751b19c1715277e80095818c)

commit dfabe8e731e489071c3e7981e389f332d806ac1a
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 11 10:02:00 2020 -0800

    s3: VFS: catia: Add read_dfs_pathat().
    
    Not yet used.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 16acdc348db71a29bec93d62073ca30a4a920389)

commit 895c06ccec22e27b32fbe07222514a13a95b7006
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Feb 11 09:48:05 2020 -0800

    s3: VFS: cap: Add cap_read_dfs_pathat().
    
    Not yet used.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 9f6c01b2cd82963bfa05552aa41dfafcb0bf7637)

commit 13c6e747da1fe1b6e20b8eaefbeb183e7c4d28fb
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 28 12:12:09 2020 -0800

    s3: VFS: shadow_copy2: Add shadow_copy2_read_dfs_pathat().
    
    Not yet used.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 9e92d46b757d6a4cdd0f956c24b30df89adf2798)

commit 5c8f5a48df7400e0d2951664c493c3bd3b77026c
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 28 10:46:43 2020 -0800

    s3: VFS: gluster: Add vfs_gluster_read_dfs_pathat().
    
    Not yet used.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 018af49b93f8e9a2cbc0d40cc68b8202e5c95c9a)

commit 7bbfc1c3a8c6968d45874af5971ce3c44f730ccb
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 28 10:18:04 2020 -0800

    s3: VFS: ceph: Add vfswrap_ceph_read_dfs_pathat().
    
    Not yet used.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit e52e2135dd9b8bd2e65261c210e7b8d36a727396)

commit 6fae0415d55c7204c6eb4a29345b61e45710f7b4
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 28 09:51:17 2020 -0800

    s3: VFS: Add SMB_VFS_READ_DFS_PATHAT().
    
    Not yet used.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 96bc3298fc025d1d76fc06833fece6c62faa5e1a)

commit 6d5220f23cf43dbceb38bc5bfccaafcede3724f4
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 28 09:36:26 2020 -0800

    s3: smbd: dfs: Clean up exits / talloc heirarchy in parse_msdfs_symlink().
    
    Ensure on error or clean return we don't leave memory on mem_ctx.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 74b47bf578dab9ce94a9f2439fa672e51afe809e)

commit b4285b8d1b1d6007242bb3aebb9252f238f5474a
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 28 09:28:30 2020 -0800

    s3: smbd: dfs: Make parameter names consistent.
    
    Initialize reflist to NULL.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit ed527dc1d8bd21d942bc14677d83363144e5f46b)

commit c13c6e44918dcb5de75b9872a119987cfbd13acb
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 27 16:45:20 2020 -0800

    s3: smbd: dfs: Allow parse_msdfs_symlink() to be called with NULL pointers.
    
    In case we don't want all the data.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 4e4afc52e6f63fa4058310c6b0a0314b8f73c189)

commit 2f2794a72419cdd871f41eb4700c27d8bdec7886
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 27 16:42:11 2020 -0800

    s3: smbd: dfs: Apply some README.Coding to parse_msdfs_symlink().
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit a211c640878d856e859ab2fdfbbe61036240b8eb)

commit 9f87784686d8a55c9e039841c9f8a1ab33a92f5e
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 27 16:35:25 2020 -0800

    s3: smbd: dfs: Make parse_msdfs_symlink() external.
    
    So it can be called by a future new VFS call.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 012b812188f636d9b8cf0edee34df5d43d2ac0a8)

commit 3ff14a2e5a3186eeeb2a97cc9c09ad22d61e31d3
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 27 16:31:52 2020 -0800

    s3: smbd: dfs: Move lp_msdfs_shuffle_referrals() call out of parse_msdfs_symlink().
    
    Removes dependency on snum for what is text parsing code.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit 028c33e09ab52b55f33f83e26a12498f57918334)

commit 7f034780869492ea7d34e662baee2e39978565ce
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jan 27 16:29:46 2020 -0800

    s3: smbd: dfs: Cleanup, reformat calls to parse_msdfs_symlink()
    
    Make parameter easier to change.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit d22b0d907252939c2ded9d73cc67dbbf8bb57fb7)

commit 1ba9c318ae1d0490ac30ddddc01d2c015e16ec35
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 28 14:59:46 2020 -0800

    s3: VFS: Implement create_dfs_pathat() in cap
    
    Now we use this instead of symlinks to create
    DFS links, it's needed in cap.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Thu Jan 30 18:21:47 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 042249d95ff59d304cf37914860ee0c4d1f546f8)

commit ce3bf591e2fa89056c2a17559b8fe2c8bd7f0980
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 28 14:42:49 2020 -0800

    s3: VFS: Implement create_dfs_pathat() in catia.
    
    Now we use this instead of symlinks to create
    DFS links, it's needed in catia.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14282
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    (cherry picked from commit fa2f83e13aa92a12bd8d0113576a04a1e4431a44)

commit 59815861b2e33efcf8c6b09d4884cf35b0cfc329
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Feb 17 15:46:53 2020 +0100

    WHATSNEW: announce vfs_io_uring
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit a1486fb28372ef66b0c90b2f73c0d0588d05352d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jun 5 17:01:49 2019 +0200

    s3:modules: add vfs_io_uring module
    
    The module makes use of the new io_uring infrastructure
    (intruduced in linux 5.1), see https://lwn.net/Articles/778411/ and
    http://git.kernel.dk/cgit/liburing/
    
    Currently this only implements SMB_VFS_{PREAD,PWRITE,FSYNC}_SEND/RECV
    and avoids the overhead of our userspace threadpool.
    
    In future we'll hopefully make more use of more advanced io_uring
    features.
    
    For now we don't have automated tests as our test infrastructure
    doesn't use a recent kernel. At least we're able to do compile tests
    on fedora31.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Sat Feb 15 11:37:45 UTC 2020 on sn-devel-184
    
    (cherry picked from commit 195e88cea34c983afc02cfb521a60cdd1edbe9e1)

commit ac78557df8e626d12ae062ed629589fd5fae060d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 7 11:00:21 2020 +0100

    bootstrap: replace libaio-dev/libaio-devel with liburing-dev/liburing-devel
    
    We'll never use libaio, but will soon add a io_uring vfs module.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit fb5a99fa0200785ef1b5a8c9bc4a645d09fbeb5e)

commit 40c84bfcdd288a617a22af6faa50a029d5d537cf
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Feb 7 11:02:18 2020 +0100

    lib/replace: remove unused check for aio.h
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit c1b9bf993402f7d74f992c609ede94653e87172f)

commit 9463a387831c1c482770fea3675d30763b7647dc
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 11 22:10:32 2020 +0100

    lib: Fix a shutdown crash with "clustering = yes"
    
    This is a bit confusing now, sorry for that:
    
    register_msg_pool_usage() in the ctdb case uses
    messaging_ctdb_register_tevent_context(), which talloc_reference()s
    the central struct messaging_ctdb_fde_ev of the
    messaging_ctdb_context. In messaging_reinit(), we talloc_free only one
    of those references and allocate a new messaging_ctdb_fde_ev. The
    remaining messaging_ctdb_fde_ev should have been deleted as well, but
    due to the second reference this does not happen. When doing the
    shutdown messaging_ctdb_fde_ev_destructor() is called twice, once on
    the properly reinitialized fde_ev, and once much later on the leftover
    one which references invalid data structures.
    
    By the way, this is not a problem with talloc_reference(), this would
    have happened with explicit refcounting too.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=14281
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Björn Baumbach <bb at sernet.de>
    Autobuild-Date(master): Tue Feb 18 13:05:53 UTC 2020 on sn-devel-184
    
    (cherry picked from commit f1577c2bc13c91ea912ae461870e470065f250c1)

commit fd63e94a2825495a7daae8d3debbb76a2532c540
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 11 21:57:42 2020 +0100

    lib: Introduce messaging_context->per_process_talloc_ctx
    
    Consolidate "msg_dgm_ref" and "msg_ctdb_ref": The only purpose of
    those pointers was to TALLOC_FREE() them in messaging_reinit(). We'll
    have a third entity to talloc_free() in the next commit, make that
    simpler.
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=14281
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 7209357f9ba5525a207d301b299931d6bdee9c2f)

commit 1b4db22b1601c999a59043fcbea5d2b09ff487e2
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 11 21:47:39 2020 +0100

    lib: Add a TALLOC_CTX to base register_msg_pool_usage() on
    
    Add a simple way to deactivate the registration
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=14281
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit dab982d88e9132cbff52db22f441c08ee59bb159)

commit 60deff09d09f7f92a6f512bc41a5de553574be50
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 11 21:26:18 2020 +0100

    lib: Simplify register_msg_pool_usage()
    
    We can do as much as we want in the filter. This gives us automatic
    retry, we don't have to do the messaging_filtered_read_send() over and
    over again
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=14281
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 8a23031b7bfea4cdaa71d6815bca24dcc3685b22)

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

Summary of changes:
 .gitlab-ci.yml                                     |   2 +-
 WHATSNEW.txt                                       |  37 ++
 bootstrap/config.py                                |  18 +-
 bootstrap/generated-dists/centos6/bootstrap.sh     |   1 -
 bootstrap/generated-dists/centos6/packages.yml     |   1 -
 bootstrap/generated-dists/centos7/bootstrap.sh     |   1 -
 bootstrap/generated-dists/centos7/packages.yml     |   1 -
 bootstrap/generated-dists/centos8/bootstrap.sh     |   1 -
 bootstrap/generated-dists/centos8/packages.yml     |   1 -
 bootstrap/generated-dists/debian10/bootstrap.sh    |   1 -
 bootstrap/generated-dists/debian10/packages.yml    |   1 -
 bootstrap/generated-dists/debian7/bootstrap.sh     |   1 -
 bootstrap/generated-dists/debian7/packages.yml     |   1 -
 bootstrap/generated-dists/debian8/bootstrap.sh     |   1 -
 bootstrap/generated-dists/debian8/packages.yml     |   1 -
 bootstrap/generated-dists/debian9/bootstrap.sh     |   1 -
 bootstrap/generated-dists/debian9/packages.yml     |   1 -
 bootstrap/generated-dists/fedora29/bootstrap.sh    |   1 -
 bootstrap/generated-dists/fedora29/packages.yml    |   1 -
 bootstrap/generated-dists/fedora30/bootstrap.sh    |   1 -
 bootstrap/generated-dists/fedora30/packages.yml    |   1 -
 bootstrap/generated-dists/fedora31/bootstrap.sh    |   2 +-
 bootstrap/generated-dists/fedora31/packages.yml    |   2 +-
 bootstrap/generated-dists/opensuse150/bootstrap.sh |   1 -
 bootstrap/generated-dists/opensuse150/packages.yml |   1 -
 bootstrap/generated-dists/opensuse151/bootstrap.sh |   1 -
 bootstrap/generated-dists/opensuse151/packages.yml |   1 -
 bootstrap/generated-dists/ubuntu1404/bootstrap.sh  |   1 -
 bootstrap/generated-dists/ubuntu1404/packages.yml  |   1 -
 bootstrap/generated-dists/ubuntu1604/bootstrap.sh  |   1 -
 bootstrap/generated-dists/ubuntu1604/packages.yml  |   1 -
 bootstrap/generated-dists/ubuntu1804/bootstrap.sh  |   1 -
 bootstrap/generated-dists/ubuntu1804/packages.yml  |   1 -
 bootstrap/sha1sum.txt                              |   2 +-
 .../{vfs_aio_pthread.8.xml => vfs_io_uring.8.xml}  |  54 +-
 docs-xml/wscript_build                             |   1 +
 examples/VFS/skel_opaque.c                         |  11 +
 examples/VFS/skel_transparent.c                    |  16 +
 lib/replace/wscript                                |   2 +-
 source3/include/proto.h                            |   3 +-
 source3/include/vfs.h                              |  19 +
 source3/include/vfs_macros.h                       |  14 +
 source3/lib/messages.c                             |  87 ++--
 source3/lib/tallocmsg.c                            |  62 +--
 source3/modules/vfs_cap.c                          |  71 ++-
 source3/modules/vfs_catia.c                        |  82 ++++
 source3/modules/vfs_ceph.c                         | 100 ++++
 source3/modules/vfs_default.c                      | 103 ++++
 source3/modules/vfs_full_audit.c                   |  28 ++
 source3/modules/vfs_glusterfs.c                    |  98 ++++
 source3/modules/vfs_io_uring.c                     | 543 +++++++++++++++++++++
 source3/modules/vfs_not_implemented.c              |  11 +
 source3/modules/vfs_shadow_copy2.c                 |  55 +++
 source3/modules/vfs_time_audit.c                   |  29 ++
 source3/modules/wscript_build                      |   8 +
 source3/smbd/msdfs.c                               | 238 ++++-----
 source3/smbd/proto.h                               |   5 +
 source3/smbd/vfs.c                                 |  16 +
 source3/wscript                                    |  11 +
 59 files changed, 1491 insertions(+), 267 deletions(-)
 copy docs-xml/manpages/{vfs_aio_pthread.8.xml => vfs_io_uring.8.xml} (55%)
 create mode 100644 source3/modules/vfs_io_uring.c


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df91d7dadb1..56adf10c7be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: cffd3e4d9ad505cbf2b6732d2e3021d60e4159ad
+  SAMBA_CI_CONTAINER_TAG: 41319f2580c026f66b2750604a0eb15d6b6f7b50
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9a521a973a9..78beb5ac12c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -77,6 +77,43 @@ to-be-ignored timestamp variables passed to the SMB_VFS_NTIMES() VFS function.
 VFS modules can check whether any of the time values inside a struct
 smb_file_time is to be ignored by calling is_omit_timespec() on the value.
 
+'io_uring' vfs module
+---------------------
+
+The module makes use of the new io_uring infrastructure
+(intruduced in Linux 5.1), see https://lwn.net/Articles/776703/
+
+Currently this implements SMB_VFS_{PREAD,PWRITE,FSYNC}_SEND/RECV
+and avoids the overhead of the userspace threadpool in the default
+vfs backend. See also vfs_io_uring(8).
+
+In order to build the module you need the liburing userspace library
+and its developement headers installed, see
+https://git.kernel.dk/cgit/liburing/
+
+At runtime you'll need a Linux kernel with version 5.1 or higher.
+Note that 5.4.14 and 5.4.15 have a regression that breaks the Samba
+module! The regression was fixed in Linux 5.4.16 again.
+
+MS-DFS changes in the VFS
+-------------------------
+
+This release changes set getting and setting of MS-DFS redirects
+on the filesystem to go through two new VFS functions:
+
+SMB_VFS_CREATE_DFS_PATHAT()
+SMB_VFS_READ_DFS_PATHAT()
+
+instead of smbd explicitly storing MS-DFS redirects inside
+symbolic links on the filesystem. The underlying default
+implementations of this has not changed, the redirects are
+still stored inside symbolic links on the filesystem, but
+moving the creation and reading of these links into the VFS
+as first-class functions now allows alternate methods of
+storing them (maybe in extended attributes) for OEMs who
+don't want to mis-use filesystem symbolic links in this
+way.
+
 REMOVED FEATURES
 ================
 
diff --git a/bootstrap/config.py b/bootstrap/config.py
index ecead21da29..bcada1dc628 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -69,7 +69,7 @@ PKGS = [
     ('mingw-w64', 'mingw64-gcc'),
     ('zlib1g-dev', 'zlib-devel'),
     ('libbsd-dev', 'libbsd-devel'),
-    ('libaio-dev', 'libaio-devel'),
+    ('liburing-dev', 'liburing-devel'),
     ('libarchive-dev', 'libarchive-devel'),
     ('libblkid-dev', 'libblkid-devel'),
     ('libcap-dev', 'libcap-devel'),
@@ -385,6 +385,7 @@ DEB_DISTS = {
             'python-gpg': 'python-gpgme',
             'python3-gpg': '',  # no python3 gpg pkg available, remove
             'language-pack-en': '',   # included in locales
+            'liburing-dev': '',   # not available
         }
     },
     'debian8': {
@@ -394,6 +395,7 @@ DEB_DISTS = {
             'python-gpg': 'python-gpgme',
             'python3-gpg': 'python3-gpgme',
             'language-pack-en': '',   # included in locales
+            'liburing-dev': '',   # not available
         }
     },
     'debian9': {
@@ -401,6 +403,7 @@ DEB_DISTS = {
         'vagrant_box': 'debian/stretch64',
         'replace': {
             'language-pack-en': '',   # included in locales
+            'liburing-dev': '',   # not available
         }
     },
     'debian10': {
@@ -408,6 +411,7 @@ DEB_DISTS = {
         'vagrant_box': 'debian/buster64',
         'replace': {
             'language-pack-en': '',   # included in locales
+            'liburing-dev': '',   # not available
         }
     },
     'ubuntu1404': {
@@ -423,6 +427,7 @@ DEB_DISTS = {
             'libunwind-dev': 'libunwind8-dev',
             'glusterfs-common': '',
             'libcephfs-dev': '',
+            'liburing-dev': '',   # not available
         }
     },
     'ubuntu1604': {
@@ -433,11 +438,15 @@ DEB_DISTS = {
             'python3-gpg': 'python3-gpgme',
             'glusterfs-common': '',
             'libcephfs-dev': '',
+            'liburing-dev': '',   # not available
         }
     },
     'ubuntu1804': {
         'docker_image': 'ubuntu:18.04',
         'vagrant_box': 'ubuntu/bionic64',
+        'replace': {
+            'liburing-dev': '',   # not available
+        }
     },
 }
 
@@ -464,6 +473,7 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'glusterfs-devel': '',
             'libcephfs-devel': '',
+            'liburing-devel': '',   # not available
         }
     },
     'centos7': {
@@ -495,6 +505,7 @@ RPM_DISTS = {
             'glusterfs-devel': '',
             'libcephfs-devel': '',
             'gnutls-devel': 'compat-gnutls34-devel',
+            'liburing-devel': '',   # not available
         }
     },
     'centos8': {
@@ -511,6 +522,7 @@ RPM_DISTS = {
             'policycoreutils-python': 'python3-policycoreutils',
             'python3-crypto': '',
             'quota-devel': '', # FIXME: Add me back, once available!
+            'liburing-devel': '', # not available yet, Add me back, once available!
         }
     },
     'fedora29': {
@@ -519,6 +531,7 @@ RPM_DISTS = {
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',
+            'liburing-devel': '',   # not available
         }
     },
     'fedora30': {
@@ -527,6 +540,7 @@ RPM_DISTS = {
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',
+            'liburing-devel': '',   # not available
         }
     },
     'fedora31': {
@@ -569,6 +583,7 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'libtasn1-tools': '', # asn1Parser is part of libtasn1
             'mingw64-gcc': '', # doesn't exist
+            'liburing-devel': '',   # not available
         }
     },
     'opensuse151': {
@@ -601,6 +616,7 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'libtasn1-tools': '', # asn1Parser is part of libtasn1
             'mingw64-gcc': '', # doesn't exist
+            'liburing-devel': '',   # not available, will be added in 15.2
         }
     }
 }
diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index b1fb2536fa9..ee6fcc33799 100755
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -46,7 +46,6 @@ yum install -y \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index cba40f3b93d..1e2b5a98fa6 100644
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -32,7 +32,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index f97c77d2a6b..2f0bb1bcc28 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -46,7 +46,6 @@ yum install -y \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 87efa4330d1..475326b6db7 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -32,7 +32,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index e19a8b169c7..22484b3f6ad 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -49,7 +49,6 @@ yum install -y \
     krb5-devel \
     krb5-server \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index a86bbbdc620..07be0deeceb 100644
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -34,7 +34,6 @@ packages:
   - krb5-devel
   - krb5-server
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh
index eb610c5ee79..f0847eb3c20 100755
--- a/bootstrap/generated-dists/debian10/bootstrap.sh
+++ b/bootstrap/generated-dists/debian10/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
     krb5-user \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian10/packages.yml
index 8440e143f62..a242cd8b362 100644
--- a/bootstrap/generated-dists/debian10/packages.yml
+++ b/bootstrap/generated-dists/debian10/packages.yml
@@ -28,7 +28,6 @@ packages:
   - krb5-user
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index ea8a9ad8afc..daedce84fd9 100755
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
     krb5-user \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index e531b5822ed..3cac6870b3e 100644
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -28,7 +28,6 @@ packages:
   - krb5-user
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 6c720adcd1a..010508360ed 100755
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
     krb5-user \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index 53052141cf5..1c9552b85f3 100644
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -28,7 +28,6 @@ packages:
   - krb5-user
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index eb610c5ee79..f0847eb3c20 100755
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
     krb5-user \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 8440e143f62..a242cd8b362 100644
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -28,7 +28,6 @@ packages:
   - krb5-user
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index c82c86166e5..effe2a9d214 100755
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -46,7 +46,6 @@ dnf install -y \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index 35aaa53c117..3b767f8ba08 100644
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -35,7 +35,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
diff --git a/bootstrap/generated-dists/fedora30/bootstrap.sh b/bootstrap/generated-dists/fedora30/bootstrap.sh
index c82c86166e5..effe2a9d214 100755
--- a/bootstrap/generated-dists/fedora30/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora30/bootstrap.sh
@@ -46,7 +46,6 @@ dnf install -y \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
diff --git a/bootstrap/generated-dists/fedora30/packages.yml b/bootstrap/generated-dists/fedora30/packages.yml
index 35aaa53c117..3b767f8ba08 100644
--- a/bootstrap/generated-dists/fedora30/packages.yml
+++ b/bootstrap/generated-dists/fedora30/packages.yml
@@ -35,7 +35,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
diff --git a/bootstrap/generated-dists/fedora31/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh
index fd6eecd1ab7..18c58092eff 100755
--- a/bootstrap/generated-dists/fedora31/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora31/bootstrap.sh
@@ -46,7 +46,6 @@ dnf install -y \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
@@ -60,6 +59,7 @@ dnf install -y \
     libtasn1-tools \
     libtirpc-devel \
     libunwind-devel \
+    liburing-devel \
     libuuid-devel \
     libxslt \
     lmdb \
diff --git a/bootstrap/generated-dists/fedora31/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml
index 8a2e2c785ad..3165af8dd82 100644
--- a/bootstrap/generated-dists/fedora31/packages.yml
+++ b/bootstrap/generated-dists/fedora31/packages.yml
@@ -35,7 +35,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
@@ -49,6 +48,7 @@ packages:
   - libtasn1-tools
   - libtirpc-devel
   - libunwind-devel
+  - liburing-devel
   - libuuid-devel
   - libxslt
   - lmdb
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 0e229caacb5..3fbcaacb24f 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -43,7 +43,6 @@ zypper --non-interactive install \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index 910f95cf55f..0eb19244677 100644
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -31,7 +31,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index 0e229caacb5..3fbcaacb24f 100755
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -43,7 +43,6 @@ zypper --non-interactive install \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index 910f95cf55f..0eb19244677 100644
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -31,7 +31,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 9c707de566d..78c8969ac69 100755
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
     language-pack-en \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \


-- 
Samba Shared Repository



More information about the samba-cvs mailing list