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

[Karolin Seeger]

The branch, v4-1-test has been updated
       via  8fd1e54 s3: libsmb : The short name length is only a one byte field.
       via  9a29d7e libcli/smb: use SMB1 MID=0 for the initial Negprot
      from  1e969dc s3:smb2_find: Return that timestamps do not exist as directories

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


- Log -----------------------------------------------------------------
commit 8fd1e540d90380875f0a2048b467b419434e0ee0
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Sep 16 19:16:52 2013 -0700

    s3: libsmb : The short name length is only a one byte field.
    
    The next byte is "undefined" and some vendors set this to 0xff
    (discovered in SNIA SDC lab tests).
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Tue Sep 17 12:27:18 CEST 2013 on sn-devel-104
    (cherry picked from commit 1c41feb7893ae4a4f42c035f3c83f8b2950b7816)
    
    Fix bug #10145 - Samba SMB2 client code reads the wrong short name length in a
    directory listing reply.
    
    Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-1-test): Wed Sep 18 11:15:35 CEST 2013 on sn-devel-104

commit 9a29d7e7c76499713588b9e5fd93d24aaac474f2
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Sep 17 04:09:03 2013 +0200

    libcli/smb: use SMB1 MID=0 for the initial Negprot
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10144
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 1d54d8c501afa151b6cc07b98a14caae2b31ec65)

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

Summary of changes:
 libcli/smb/smbXcli_base.c      |    8 ++++++++
 source3/libsmb/cli_smb2_fnum.c |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index f8ebf0b..1e91975 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -737,6 +737,14 @@ static uint16_t smb1cli_alloc_mid(struct smbXcli_conn *conn)
 	size_t num_pending = talloc_array_length(conn->pending);
 	uint16_t result;
 
+	if (conn->protocol == PROTOCOL_NONE) {
+		/*
+		 * This is what windows sends on the SMB1 Negprot request
+		 * and some vendors reuse the SMB1 MID as SMB2 sequence number.
+		 */
+		return 0;
+	}
+
 	while (true) {
 		size_t i;
 
diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index 18b03f3..3253f9d 100644
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -412,7 +412,7 @@ static NTSTATUS parse_finfo_id_both_directory_info(uint8_t *dir_data,
 	if (namelen > (dir_data_length - 104)) {
 		return NT_STATUS_INFO_LENGTH_MISMATCH;
 	}
-	slen = SVAL(dir_data + 68, 0);
+	slen = CVAL(dir_data + 68, 0);
 	if (slen > 24) {
 		return NT_STATUS_INFO_LENGTH_MISMATCH;
 	}


-- 
Samba Shared Repository