[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  d80b8f2 Revert "selftest: mark samba3.smb2.kernel-oplocks as flapping"
       via  9f83d43 s4: torture: Fix race condition in test_smb2_kernel_oplocks8.
       via  bfd063d WHATSNEW: Add new smb.conf parameter
       via  8860f50 WHATSNEW: Remove old entry about accelerated AES
      from  54b3706 WHATSNEW: Explain reversal of smbclient symlink parameters against Windows server.

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


- Log -----------------------------------------------------------------
commit d80b8f29ba3bb811a71f9aae8606b0cbe89587f4
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 30 12:28:03 2017 -0800

    Revert "selftest: mark samba3.smb2.kernel-oplocks as flapping"
    
    The correct fix is in the previous commit, to block the
    RT_SIGNAL_LEASE until we're ready to receive it.
    
    This reverts commit 27bb8814a526adbd22452ce58754d18e1b00d426.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Böhme <slow at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Dec  2 03:50:39 CET 2017 on sn-devel-144

commit 9f83d435bb21aeb3d309b764170789ed100c9ad7
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Nov 30 12:25:02 2017 -0800

    s4: torture: Fix race condition in test_smb2_kernel_oplocks8.
    
    The child process gets the kernel lease and then notifies
    the parent process to continue by writing a byte up a pipe.
    It then sets the alarm and calls pause() to wait for the
    parent process to contact the smbd and get it to trigger
    the break request using an open call.
    
    It is possible for the parent to run and trigger the break
    request after the child has written to the pipe, but *before*
    the child calls pause(). We then miss the signal notifying
    the child to break the lease.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13121
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Böhme <slow at samba.org>

commit bfd063d7e8f921f8f47d5f43a64f40ef85fcbde9
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Nov 29 11:45:42 2017 +0100

    WHATSNEW: Add new smb.conf parameter
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 8860f501cdcf3e6370a107329e6f1db50718c97d
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Nov 29 10:04:19 2017 +0100

    WHATSNEW: Remove old entry about accelerated AES
    
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 WHATSNEW.txt                       | 23 ++++-------------------
 selftest/flapping.d/kernel-oplocks |  4 ----
 source4/torture/smb2/oplock.c      | 16 ++++++++++++++--
 3 files changed, 18 insertions(+), 25 deletions(-)
 delete mode 100644 selftest/flapping.d/kernel-oplocks


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9a7547e..3acadc3 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -16,25 +16,6 @@ UPGRADING
 NEW FEATURES/CHANGES
 ====================
 
-Using x86_64 Accelerated AES Crypto Instructions
-================================================
-
-Samba on x86_64 can now be configured to use the Intel accelerated AES
-instruction set, which has the potential to make SMB3 signing and
-encryption much faster on client and server. To enable this, configure
-Samba using the new option --accel-aes=intelaesni.
-
-This is a temporary solution that is being included to allow users
-to enjoy the benefits of Intel accelerated AES on the x86_64 platform,
-but the longer-term solution will be to move Samba to a fully supported
-external crypto library.
-
-The third_party/aesni-intel code will be removed from Samba as soon as
-external crypto library performance reaches parity.
-
-The default is to build without setting --accel-aes, which uses the
-existing Samba software AES implementation.
-
 KDC GPO application
 -------------------
 
@@ -53,7 +34,11 @@ smb.conf changes
 
   Parameter Name                     Description             Default
   --------------                     -----------             -------
+  binddns dir			     New
+  gpo update command		     New
   oplock contention limit            Removed
+  prefork children		     New		     1
+
 
 NT4-style replication based net commands removed
 ================================================
diff --git a/selftest/flapping.d/kernel-oplocks b/selftest/flapping.d/kernel-oplocks
deleted file mode 100644
index 2102e2b..0000000
--- a/selftest/flapping.d/kernel-oplocks
+++ /dev/null
@@ -1,4 +0,0 @@
-# The smb2.kernel-oplocks tests fails often on Ubuntu 14.04 on the
-# Catalyst Cloud but failures have been seen on normal workstations
-# and sn-devel.
-^samba3.smb2.kernel-oplocks.kernel_oplocks8
diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c
index 6d749f9..87d7d2ff 100644
--- a/source4/torture/smb2/oplock.c
+++ b/source4/torture/smb2/oplock.c
@@ -4838,6 +4838,18 @@ static int do_child_process(int pipefd, const char *name)
 	int fd = -1;
 	char c = 0;
 	struct sigaction act;
+	sigset_t set;
+	sigset_t empty_set;
+
+	/* Block RT_SIGNAL_LEASE and SIGALRM. */
+	sigemptyset(&set);
+	sigemptyset(&empty_set);
+	sigaddset(&set, RT_SIGNAL_LEASE);
+	sigaddset(&set, SIGALRM);
+	ret = sigprocmask(SIG_SETMASK, &set, NULL);
+	if (ret == -1) {
+		return 11;
+	}
 
 	/* Set up a signal handler for RT_SIGNAL_LEASE. */
 	ZERO_STRUCT(act);
@@ -4878,8 +4890,8 @@ static int do_child_process(int pipefd, const char *name)
 	/* Ensure the pause doesn't hang forever. */
 	alarm(5);
 
-	/* Wait for RT_SIGNAL_LEASE. */
-	ret = pause();
+	/* Wait for RT_SIGNAL_LEASE or SIGALRM. */
+	ret = sigsuspend(&empty_set);
 	if (ret != -1 || errno != EINTR) {
 		return 6;
 	}


-- 
Samba Shared Repository