The branch, master has been updated via b23f5a9 libcli/smb: make use of data_blob_string_const_null() via 1e7f8d5 s3:smbd/sesssetup: use a helper variable 'action' to mark guest access from f35d201 Add an option to have s3fs as file server for samba4
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b23f5a9418e8acca035930e031c4624478a3d8a9 Author: Stefan Metzmacher <me...@samba.org> Date: Mon Apr 16 10:25:12 2012 +0200 libcli/smb: make use of data_blob_string_const_null() metze Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Mon Apr 16 12:21:17 CEST 2012 on sn-devel-104 commit 1e7f8d5ad0678566f14ce1c0b67e131183decf08 Author: Stefan Metzmacher <me...@samba.org> Date: Sun Apr 1 21:19:53 2012 +0200 s3:smbd/sesssetup: use a helper variable 'action' to mark guest access metze ----------------------------------------------------------------------- Summary of changes: libcli/smb/smbXcli_base.c | 18 ++++++------------ source3/smbd/sesssetup.c | 4 +++- 2 files changed, 9 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index b54d7e4..67ab3d0 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -4145,10 +4145,8 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session, } if (conn->protocol >= PROTOCOL_SMB2_24) { -#define _STRING_BLOB(x) data_blob_const((const uint8_t *)(x), sizeof(x)) - const DATA_BLOB label = _STRING_BLOB("SMB2AESCMAC"); - const DATA_BLOB context = _STRING_BLOB("SmbSign"); -#undef _STRING_BLOB + const DATA_BLOB label = data_blob_string_const_null("SMB2AESCMAC"); + const DATA_BLOB context = data_blob_string_const_null("SmbSign"); smb2_key_derivation(session_key, sizeof(session_key), label.data, label.length, @@ -4164,10 +4162,8 @@ NTSTATUS smb2cli_session_set_session_key(struct smbXcli_session *session, } if (conn->protocol >= PROTOCOL_SMB2_24) { -#define _STRING_BLOB(x) data_blob_const((const uint8_t *)(x), sizeof(x)) - const DATA_BLOB label = _STRING_BLOB("SMB2APP"); - const DATA_BLOB context = _STRING_BLOB("SmbRpc"); -#undef _STRING_BLOB + const DATA_BLOB label = data_blob_string_const_null("SMB2APP"); + const DATA_BLOB context = data_blob_string_const_null("SmbRpc"); smb2_key_derivation(session_key, sizeof(session_key), label.data, label.length, @@ -4269,10 +4265,8 @@ NTSTATUS smb2cli_session_set_channel_key(struct smbXcli_session *session, } if (conn->protocol >= PROTOCOL_SMB2_24) { -#define _STRING_BLOB(x) data_blob_const((const uint8_t *)(x), sizeof(x)) - const DATA_BLOB label = _STRING_BLOB("SMB2AESCMAC"); - const DATA_BLOB context = _STRING_BLOB("SmbSign"); -#undef _STRING_BLOB + const DATA_BLOB label = data_blob_string_const_null("SMB2AESCMAC"); + const DATA_BLOB context = data_blob_string_const_null("SmbSign"); smb2_key_derivation(channel_key, sizeof(channel_key), label.data, label.length, diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 6bc1260..7d1535a 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -400,6 +400,7 @@ void reply_sesssetup_and_X(struct smb_request *req) struct auth_usersupplied_info *user_info = NULL; struct auth_session_info *session_info = NULL; uint16 smb_flag2 = req->flags2; + uint16_t action = 0; NTSTATUS nt_status; struct smbd_server_connection *sconn = req->sconn; @@ -745,7 +746,7 @@ void reply_sesssetup_and_X(struct smb_request *req) } if (security_session_user_level(session_info, NULL) < SECURITY_USER) { - SSVAL(req->outbuf,smb_vwv2,1); + action = 1; } /* register the name and uid as being validated, so further connections @@ -780,6 +781,7 @@ void reply_sesssetup_and_X(struct smb_request *req) data_blob_free(&nt_resp); data_blob_free(&lm_resp); + SSVAL(req->outbuf,smb_vwv2,action); SSVAL(req->outbuf,smb_uid,sess_vuid); SSVAL(discard_const_p(char, req->inbuf),smb_uid,sess_vuid); req->vuid = sess_vuid; -- Samba Shared Repository