[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  abe499b torture: Correctly initialize array size
      from  815fdb4 samba-tool: fix reply when zero day pwd expiry is set

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


- Log -----------------------------------------------------------------
commit abe499be569c9087f007331d3ac2e48cea0e2cae
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Sep 7 21:09:32 2014 +0200

    torture: Correctly initialize array size
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=10800
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Mon Sep  8 16:41:51 CEST 2014 on sn-devel-104

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

Summary of changes:
 source4/torture/smb2/dir.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/smb2/dir.c b/source4/torture/smb2/dir.c
index 0e409f2..cf96fee 100644
--- a/source4/torture/smb2/dir.c
+++ b/source4/torture/smb2/dir.c
@@ -895,7 +895,6 @@ static bool check_result(struct torture_context *tctx,
 static bool test_modify_search(struct torture_context *tctx,
 			       struct smb2_tree *tree)
 {
-	int num_files = 700;
 	struct multiple_result result;
 	union smb_setfileinfo sfinfo;
 	TALLOC_CTX *mem_ctx = talloc_new(tctx);
@@ -903,7 +902,8 @@ static bool test_modify_search(struct torture_context *tctx,
 	struct smb2_handle h;
 	struct smb2_find f;
 	union smb_search_data *d;
-	struct file_elem files[702] = {};
+	struct file_elem files[703] = {};
+	int num_files = ARRAY_SIZE(files)-3;
 	NTSTATUS status;
 	bool ret = true;
 	int i;


-- 
Samba Shared Repository