[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-547-g8595f26

[Tim Prouty]

The branch, master has been updated
       via  8595f260ebec2bf06d24d68a8c2f96810647156b (commit)
      from  21391f7fbe6c92ba050462750571cda661f5fb8a (commit)

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


- Log -----------------------------------------------------------------
commit 8595f260ebec2bf06d24d68a8c2f96810647156b
Author: Zach Loafman <zachary.loafman at isilon.com>
Date:   Wed Mar 18 10:36:59 2009 -0700

    s4 libcli: Add back Longhorn beta dialect as a constant
    
    Also tweak how the dialect array and count is initialized.

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

Summary of changes:
 source4/libcli/smb2/connect.c |    7 +++----
 source4/libcli/smb2/smb2.h    |    1 +
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index 3fd9a38..b522a56 100644
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -162,7 +162,8 @@ static void continue_socket(struct composite_context *creq)
 	struct smbcli_socket *sock;
 	struct smb2_transport *transport;
 	struct smb2_request *req;
-	uint16_t dialects[2];
+	uint16_t dialects[3] = { SMB2_DIALECT_REVISION, SMB21_DIALECT_REVISION,
+				 SMB2_LONGHORN_BETA_DIALECT_REVISION };
 
 	c->status = smbcli_sock_connect_recv(creq, state, &sock);
 	if (!composite_is_ok(c)) return;
@@ -171,7 +172,7 @@ static void continue_socket(struct composite_context *creq)
 	if (composite_nomem(transport, c)) return;
 
 	ZERO_STRUCT(state->negprot);
-	state->negprot.in.dialect_count = 2;
+	state->negprot.in.dialect_count = sizeof(dialects) / sizeof(dialects[0]);
 	switch (transport->options.signing) {
 	case SMB_SIGNING_OFF:
 		state->negprot.in.security_mode = 0;
@@ -187,8 +188,6 @@ static void continue_socket(struct composite_context *creq)
 	}
 	state->negprot.in.capabilities  = 0;
 	unix_to_nt_time(&state->negprot.in.start_time, time(NULL));
-	dialects[0] = SMB2_DIALECT_REVISION;
-	dialects[1] = SMB21_DIALECT_REVISION;
 	state->negprot.in.dialects = dialects;
 
 	req = smb2_negprot_send(transport, &state->negprot);
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index 3cc3ec2..7c07c84 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -230,6 +230,7 @@ struct smb2_request {
 /* the dialects we support */
 #define SMB2_DIALECT_REVISION           0x202
 #define SMB21_DIALECT_REVISION          0x210
+#define SMB2_LONGHORN_BETA_DIALECT_REVISION	0x0 /* early beta dialect */
 
 /* SMB2 negotiate security_mode */
 #define SMB2_NEGOTIATE_SIGNING_ENABLED   0x01


-- 
Samba Shared Repository