[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-499-g7cd0977

Jeremy Allison jra at samba.org
Wed Sep 10 04:26:00 GMT 2008


The branch, v4-0-test has been updated
       via  7cd0977a28e9973ff71e9e0146fef6e6771a72b5 (commit)
       via  8cebd4d36c862dcdc6551dc6bf4dda2342dfede7 (commit)
      from  ed26195d0eda6dd1ca14508cfd31a48dde79d44f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 7cd0977a28e9973ff71e9e0146fef6e6771a72b5
Merge: 8cebd4d36c862dcdc6551dc6bf4dda2342dfede7 ed26195d0eda6dd1ca14508cfd31a48dde79d44f
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Sep 9 21:25:03 2008 -0700

    Merge branch 'v4-0-test' of ssh://jra@git.samba.org/data/git/samba into v4-0-test

commit 8cebd4d36c862dcdc6551dc6bf4dda2342dfede7
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Sep 9 21:24:34 2008 -0700

    A truncate write must be a smbcli_smbwrite, not a
    smbcli_write.
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source/torture/basic/delaywrite.c b/source/torture/basic/delaywrite.c
index 7056023..1331968 100644
--- a/source/torture/basic/delaywrite.c
+++ b/source/torture/basic/delaywrite.c
@@ -2602,7 +2602,7 @@ static bool test_delayed_write_update5b(struct torture_context *tctx,
 	while (!timeval_expired(&end)) {
 		/* do a write */
 		torture_comment(tctx, "Do a truncate write on the file handle\n");
-		written = smbcli_write(cli->tree, fnum1, 0, "x", 0, 0);
+		written = smbcli_smbwrite(cli->tree, fnum1, "x", 1024, 0);
 		if (written != 0) {
 			torture_result(tctx, TORTURE_FAIL, __location__": written gave %d - should have been 1", (int)written);
 			ret = false;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list