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

[Karolin Seeger]

The branch, v4-6-test has been updated
       via  4de3ddc s3: smbd: Fix open_files.idl to correctly ignore share_mode_lease *lease in share_mode_entry.
       via  f71feca ctdb-tests: Use tighter pattern for matching expected output
       via  4a33726 ctdb-tests: Explicitly search for the specific log entry
      from  3e50a50 ctdb-logging: Initialize DEBUGLEVEL before changing the value

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


- Log -----------------------------------------------------------------
commit 4de3ddc572ba119e9414f8ae6547dd14a574e56f
Author: Jeremy Allison <jra at samba.org>
Date:   Tue May 16 16:12:19 2017 -0700

    s3: smbd: Fix open_files.idl to correctly ignore share_mode_lease *lease in share_mode_entry.
    
    This is currently marked 'skip', which means it isn't stored in the
    db, but printed out in ndr dump. However, this pointer can be invalid
    if the lease_idx is set to 0xFFFFFFFF (invalid).
    
    This is fixed up inside parse_share_modes(), but not until after
    ndr_pull_share_mode_data() is called. If lease_idx == 0xFFFFFFFF
    then ndr_print_share_mode_lease() prints an invalid value and
    crashes.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12793
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu May 18 03:01:40 CEST 2017 on sn-devel-144
    
    (cherry picked from commit b691f6d32f79ef8427f567612243dd51ea8d5584)
    
    Autobuild-User(v4-6-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-6-test): Fri May 19 13:33:08 CEST 2017 on sn-devel-144

commit f71fecac77c4d8922ebb4771b8430bcb90e4f100
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Apr 20 14:34:54 2017 +1000

    ctdb-tests: Use tighter pattern for matching expected output
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12792
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    
    Autobuild-User(master): Martin Schwenke <martins at samba.org>
    Autobuild-Date(master): Mon May 15 08:08:10 CEST 2017 on sn-devel-144
    
    (cherry picked from commit 9b5078919796da8dd7893e0a4f716dc1f1991de5)

commit 4a337266d64c6dbbb788a0318aab75d20cf7b8a7
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Mar 7 16:52:26 2017 +1100

    ctdb-tests: Explicitly search for the specific log entry
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12792
    
    ... instead of expecting the last line to be the matching log entry.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    (cherry picked from commit 3db572832e9b99ea5b6d531d3b7331b8c0131fd6)

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

Summary of changes:
 ctdb/tests/eventd/eventd_051.sh    | 2 +-
 ctdb/tests/eventd/scripts/local.sh | 2 +-
 source3/librpc/idl/open_files.idl  | 2 +-
 source3/locking/share_mode_lock.c  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/tests/eventd/eventd_051.sh b/ctdb/tests/eventd/eventd_051.sh
index 213965a..46162de 100755
--- a/ctdb/tests/eventd/eventd_051.sh
+++ b/ctdb/tests/eventd/eventd_051.sh
@@ -20,4 +20,4 @@ simple_test run monitor 30
 required_result 0 <<EOF
 ctdb-eventd[PID]: 01.test: Running event monitor
 EOF
-unit_test tail -n 1 "$eventd_logfile"
+unit_test grep "01.test:" "$eventd_logfile"
diff --git a/ctdb/tests/eventd/scripts/local.sh b/ctdb/tests/eventd/scripts/local.sh
index 61fff8c..343205e 100644
--- a/ctdb/tests/eventd/scripts/local.sh
+++ b/ctdb/tests/eventd/scripts/local.sh
@@ -122,7 +122,7 @@ simple_test ()
 
 result_filter ()
 {
-	_duration="[0-9]*\.[0-9][0-9][0-9]"
+	_duration="\<[0-9][0-9]*\.[0-9][0-9][0-9]\>"
 	_day="\(Mon\|Tue\|Wed\|Thu\|Fri\|Sat\|Sun\)"
 	_month="\(Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec\)"
 	_date="\( [0-9]\|[0-9][0-9]\)"
diff --git a/source3/librpc/idl/open_files.idl b/source3/librpc/idl/open_files.idl
index 6f74340..1f85f24 100644
--- a/source3/librpc/idl/open_files.idl
+++ b/source3/librpc/idl/open_files.idl
@@ -62,7 +62,7 @@ interface open_files
 		 * to store this share_mode_entry on disk.
 		 */
 		[skip] boolean8	stale;
-		[skip] share_mode_lease *lease;
+		[ignore] share_mode_lease *lease;
 	} share_mode_entry;
 
 	typedef [public] struct {
diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index f738323..91c53ff 100644
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -322,8 +322,8 @@ static struct share_mode_data *parse_share_modes(TALLOC_CTX *mem_ctx,
 	}
 
 	/*
-	 * Initialize the values that are [skip] in the idl. The NDR code does
-	 * not initialize them.
+	 * Initialize the values that are [skip] or [ignore]
+	 * in the idl. The NDR code does not initialize them.
 	 */
 
 	for (i=0; i<d->num_share_modes; i++) {


-- 
Samba Shared Repository