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

[Karolin Seeger]

The branch, v4-1-test has been updated
       via  f93df45 smbd: We now survive smb2.oplock.stream1
       via  05417be s3: smbd: streams - Ensure share mode validation ignores internal opens (op_mid == 0).
      from  7bbf54d nsswitch: Skip groups we were not able to map.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test


- Log -----------------------------------------------------------------
commit f93df45f3e9822a6919d5651869fd7ca2d787ac8
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Sep 29 08:14:57 2014 +0000

    smbd: We now survive smb2.oplock.stream1
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10797
    
    Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-1-test): Mon Sep 29 23:16:34 CEST 2014 on sn-devel-104

commit 05417be9fd0ba9063641e795f4f0541cf32b7c90
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 9 10:53:52 2014 +0000

    s3: smbd: streams - Ensure share mode validation ignores internal opens (op_mid == 0).
    
    Fixes bug 10797 - smbd panic at find_oplock_types
    
    https://bugzilla.samba.org/show_bug.cgi?id=10797
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 selftest/knownfail  |    1 -
 source3/smbd/open.c |    7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/knownfail b/selftest/knownfail
index c493dba..8d11dfe 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -208,7 +208,6 @@
 ^samba3.smb2.oplock.exclusive5
 ^samba3.smb2.oplock.batch12
 ^samba3.smb2.oplock.batch20
-^samba3.smb2.oplock.stream1
 ^samba3.smb2.streams.rename
 ^samba3.smb2.streams.rename2
 ^samba3.smb2.streams.attributes
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 6bb37e9..4fcdff8 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1109,7 +1109,7 @@ static void validate_my_share_entries(struct smbd_server_connection *sconn,
 		return;
 	}
 
-	if (share_entry->share_file_id == 0) {
+	if (share_entry->op_mid == 0) {
 		/* INTERNAL_OPEN_ONLY */
 		return;
 	}
@@ -1332,6 +1332,11 @@ static void find_oplock_types(files_struct *fsp,
 			continue;
 		}
 
+		if (e->op_mid == 0) {
+			/* INTERNAL_OPEN_ONLY */
+			continue;
+		}
+
 		if (e->op_type == NO_OPLOCK && is_stat_open(e->access_mask)) {
 			/* We ignore stat opens in the table - they
 			   always have NO_OPLOCK and never get or


-- 
Samba Shared Repository