[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1741-g96ede10

[Tim Prouty]

The branch, master has been updated
       via  96ede10cfb3b939b6d69e635baef3c8694bbc1f6 (commit)
       via  cfc68fc9d99bf1e334e53b1e9e74d56d678b6795 (commit)
      from  c3f6eff4f5711245991237d03b66e1570e6e35a5 (commit)

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


- Log -----------------------------------------------------------------
commit 96ede10cfb3b939b6d69e635baef3c8694bbc1f6
Author: Tim Prouty <tprouty at samba.org>
Date:   Thu May 21 12:17:53 2009 -0700

    s3 torture: Fix warning

commit cfc68fc9d99bf1e334e53b1e9e74d56d678b6795
Author: Tim Prouty <tprouty at samba.org>
Date:   Thu May 21 12:17:33 2009 -0700

    s3 onefs: Fix invalid argument from the unix_convert smb_filename struct patch

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index 7d4379f..6cfa24f 100644
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -2069,7 +2069,7 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle,
 			goto fail;
 		}
 
-		status = get_full_smb_filename(talloc_tos(), &smb_fname,
+		status = get_full_smb_filename(talloc_tos(), smb_fname,
 					       &converted_fname);
 		if (!NT_STATUS_IS_OK(status)) {
 			TALLOC_FREE(smb_fname);
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 25a912d..6651219 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -4221,7 +4221,7 @@ static bool run_simple_posix_open_test(int dummy)
 
   out:
 
-	if (fnum1 != -1) {
+	if (fnum1 != (uint16_t)-1) {
 		cli_close(cli1, fnum1);
 		fnum1 = -1;
 	}


-- 
Samba Shared Repository