[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-497-g211e255

[Stefan (metze) Metzmacher]

Hi Zach,

>  	switch (transport->options.signing) {
>  	case SMB_SIGNING_OFF:
> @@ -187,7 +188,7 @@ 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] = 0;
> +	dialects[1] = SMB21_DIALECT_REVISION;
>  	state->negprot.in.dialects = dialects;

There was a reason to also provide dialect '0', as I want to work
against early longhorn beta versions.

I think the list should be:

dialects[0] = SMB21_DIALECT_REVISION;
dialects[1] = SMB2_DIALECT_REVISION;
dialects[2] = 0;

If we want SMB21_DIALECT_REVISION.

>  	req = smb2_negprot_send(transport, &state->negprot);
> diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
> index d1d5b84..3cc3ec2 100644
> --- a/source4/libcli/smb2/smb2.h
> +++ b/source4/libcli/smb2/smb2.h
> @@ -35,6 +35,7 @@ struct smb2_negotiate {
>  	NTTIME system_time;
>  	NTTIME server_start_time;
>  	uint16_t security_mode;
> +	uint16_t dialect_revision;
>  };
>  
>  /* this is the context for the smb2 transport layer */
> @@ -226,8 +227,9 @@ struct smb2_request {
>  
>  #define SMB2_MAGIC 0x424D53FE /* 0xFE 'S' 'M' 'B' */
>  
> -/* the dialect we support */
> +/* the dialects we support */
>  #define SMB2_DIALECT_REVISION           0x202
> +#define SMB21_DIALECT_REVISION          0x210
>  
>  /* SMB2 negotiate security_mode */
>  #define SMB2_NEGOTIATE_SIGNING_ENABLED   0x01
> diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c
> index 4e7cdf5..7f544b5 100644
> --- a/source4/libcli/util/nterr.c
> +++ b/source4/libcli/util/nterr.c
> @@ -549,6 +549,7 @@ static const nt_err_code_struct nt_errs[] =
>  	{ "NT_STATUS_OBJECTID_NOT_FOUND", NT_STATUS_OBJECTID_NOT_FOUND },
>  	{ "NT_STATUS_DOWNGRADE_DETECTED", NT_STATUS_DOWNGRADE_DETECTED },
>  	{ "NT_STATUS_DS_BUSY", NT_STATUS_DS_BUSY },
> +	{ "XXX_INVALID_RANGE", NT_STATUS_WIN7_INVALID_RANGE },

Could you please fix this, and let us display the correct name?

metze

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
Url : http://lists.samba.org/archive/samba-technical/attachments/20090318/b0ed8569/signature.bin