[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  dc24e22 smb2_constants: fix a typo
       via  a1ac670 s3:smb2_server: use SMB2_WATCH_TREE
       via  583a538 smb2_constants: add SMB2_WATCH_TREE
       via  8b25bc8 s3:smb2_server fix a typo
      from  197c185 s3: Fix some blank line endings

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


- Log -----------------------------------------------------------------
commit dc24e229a55d07dfc199e302d9cea5377b627e8c
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Mar 2 21:35:22 2012 -0800

    smb2_constants: fix a typo
    
    Autobuild-User: Christian Ambach <ambi at samba.org>
    Autobuild-Date: Sat Mar  3 09:04:40 CET 2012 on sn-devel-104

commit a1ac670a8c69fff47bf120acdee4820081b54bc3
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Mar 2 21:34:32 2012 -0800

    s3:smb2_server: use SMB2_WATCH_TREE
    
    it makes the code easier to understand if it uses the names specified in MS-SMB2 instead
    of just the underlying values

commit 583a53835b1709327c96f47466ca3db39a0b3d50
Author: Christian Ambach <ambi at samba.org>
Date:   Fri Mar 2 21:33:28 2012 -0800

    smb2_constants: add SMB2_WATCH_TREE

commit 8b25bc80c95ff79ac87b3db034203369dea959a5
Author: Christian Ambach <ambi at samba.org>
Date:   Mon Feb 27 17:52:21 2012 -0800

    s3:smb2_server fix a typo

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

Summary of changes:
 libcli/smb/smb2_constants.h |    5 ++++-
 source3/smbd/smb2_notify.c  |    2 +-
 source3/smbd/smb2_server.c  |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h
index 6699dd7..b8180ce 100644
--- a/libcli/smb/smb2_constants.h
+++ b/libcli/smb/smb2_constants.h
@@ -113,7 +113,7 @@
 #define SMB2_SHAREFLAG_ACCESS_BASED_DIRECTORY_ENUM       0x0800
 #define SMB2_SHAREFLAG_ALL                               0x0F33
 
-/* SMB2 share capafilities */
+/* SMB2 share capabilities */
 #define SMB2_SHARE_CAP_DFS		0x8
 
 /* SMB2 create security flags */
@@ -161,6 +161,9 @@
 #define SMB2_CREATE_TAG_QFID "QFid"
 #define SMB2_CREATE_TAG_RQLS "RqLs"
 
+/* SMB2 notify flags */
+#define SMB2_WATCH_TREE 0x0001
+
 /* SMB2 Create ignore some more create_options */
 #define SMB2_CREATE_OPTIONS_NOT_SUPPORTED_MASK	(NTCREATEX_OPTIONS_TREE_CONNECTION | \
 						 NTCREATEX_OPTIONS_OPFILTER)
diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c
index 49051bf..be56b18 100644
--- a/source3/smbd/smb2_notify.c
+++ b/source3/smbd/smb2_notify.c
@@ -192,7 +192,7 @@ static struct tevent_req *smbd_smb2_notify_send(TALLOC_CTX *mem_ctx,
 	struct smb_request *smbreq;
 	connection_struct *conn = smb2req->tcon->compat_conn;
 	files_struct *fsp;
-	bool recursive = (in_flags & 0x0001) ? true : false;
+	bool recursive = (in_flags & SMB2_WATCH_TREE) ? true : false;
 	NTSTATUS status;
 
 	req = tevent_req_create(mem_ctx, &state,
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 7233e09..8533157 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1288,7 +1288,7 @@ NTSTATUS smbd_smb2_request_verify_sizes(struct smbd_smb2_request *req,
 	/*
 	 * Now check the expected body size,
 	 * where the last byte might be in the
-	 * dynnamic section..
+	 * dynamic section..
 	 */
 	if (req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) {
 		return NT_STATUS_INVALID_PARAMETER;


-- 
Samba Shared Repository