[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  677bc1b1842 s4:torture: Skip the deltest20 as user root
      from  3d40efaed8b ctdb-test: Fix a typo

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 677bc1b18420e717154dc73f632044239ac3ff9e
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jan 30 16:18:25 2020 +0100

    s4:torture: Skip the deltest20 as user root
    
    The test is meant to be run as a user and not root.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14257
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu Jan 30 16:54:33 UTC 2020 on sn-devel-184

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

Summary of changes:
 source4/torture/basic/delete.c | 4 ++++
 1 file changed, 4 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index a8c4e3fa3f1..d14d5a55746 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -1865,6 +1865,10 @@ static bool deltest20(struct torture_context *tctx, struct smbcli_state *cli1, s
 	NTSTATUS status;
 	int ret;
 
+	if (geteuid() == 0) {
+		torture_skip(tctx, "This test doesn't work as user root.");
+	}
+
 	del_clean_area(cli1, cli2);
 
 	/* Test 20 -- non-empty directory hardest to get right... */


-- 
Samba Shared Repository