[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  cd3a935 s3: Fix a cut&paste error
       via  0923e7f s3: Fix a typo
      from  bed281d s3: Remove the unused "file_existed" parameter from smbd_calculate_access_mask

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


- Log -----------------------------------------------------------------
commit cd3a935d0e170cf82ac16ee99affab4950fe0b72
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 3 15:20:09 2012 +0100

    s3: Fix a cut&paste error
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Tue Jan  3 16:57:44 CET 2012 on sn-devel-104

commit 0923e7fa39f18a9717230d82c4f3488391e7e961
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 3 15:13:48 2012 +0100

    s3: Fix a typo

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

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


Changeset truncated at 500 lines:

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 9e16bac..619f92d 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3778,7 +3778,7 @@ static bool run_oplock4(int dummy)
 
 	ev = tevent_context_init(talloc_tos());
 	if (ev == NULL) {
-		printf("tevent_req_create failed\n");
+		printf("tevent_context_init failed\n");
 		return false;
 	}
 
@@ -3802,7 +3802,7 @@ static bool run_oplock4(int dummy)
 
 	open_req = cli_openx_send(
 		talloc_tos(), ev, cli2, fname_ln, O_RDWR, DENY_NONE);
-	if (oplock_req == NULL) {
+	if (open_req == NULL) {
 		printf("cli_openx_send failed\n");
 		return false;
 	}


-- 
Samba Shared Repository