[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4239-gf953fd6

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  f953fd62f7e4d4d18eb4d713989eacce630c4949 (commit)
       via  7111d24f585643e92e5cd62cb339e771e7fcc8c4 (commit)
      from  306b507c3ba1b864b6d66f9438f91f979b02030f (commit)

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


- Log -----------------------------------------------------------------
commit f953fd62f7e4d4d18eb4d713989eacce630c4949
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 8 17:42:22 2008 +0200

    Remove a pointless level of indirection

commit 7111d24f585643e92e5cd62cb339e771e7fcc8c4
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 8 17:24:24 2008 +0200

    Fix a typo

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

Summary of changes:
 source/include/proto.h  |    1 -
 source/smbd/fake_file.c |    8 --------
 source/smbd/files.c     |    4 +---
 source/smbd/ipc.c       |    2 +-
 4 files changed, 2 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/proto.h b/source/include/proto.h
index d990b47..cd24bf8 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -9652,7 +9652,6 @@ NTSTATUS open_fake_file(connection_struct *conn,
 				const char *fname,
 				uint32 access_mask,
 				files_struct **result);
-void destroy_fake_file_handle(struct fake_file_handle **fh);
 NTSTATUS close_fake_file(files_struct *fsp);
 
 /* The following definitions come from smbd/file_access.c  */
diff --git a/source/smbd/fake_file.c b/source/smbd/fake_file.c
index 8dd9abe..1761cb6 100644
--- a/source/smbd/fake_file.c
+++ b/source/smbd/fake_file.c
@@ -146,14 +146,6 @@ NTSTATUS open_fake_file(connection_struct *conn,
 	return NT_STATUS_OK;
 }
 
-void destroy_fake_file_handle(struct fake_file_handle **fh)
-{
-	if (!fh) {
-		return;
-	}
-	TALLOC_FREE(*fh);
-}
-
 NTSTATUS close_fake_file(files_struct *fsp)
 {
 	file_free(fsp);
diff --git a/source/smbd/files.c b/source/smbd/files.c
index 8d06e20..519f494 100644
--- a/source/smbd/files.c
+++ b/source/smbd/files.c
@@ -400,9 +400,7 @@ void file_free(files_struct *fsp)
 
 	string_free(&fsp->fsp_name);
 
-	if (fsp->fake_file_handle) {
-		destroy_fake_file_handle(&fsp->fake_file_handle);
-	}
+	TALLOC_FREE(fsp->fake_file_handle);
 
 	if (fsp->fh->ref_count == 1) {
 		SAFE_FREE(fsp->fh);
diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
index f4c4599..0f2caad 100644
--- a/source/smbd/ipc.c
+++ b/source/smbd/ipc.c
@@ -318,7 +318,7 @@ static void api_fd_reply(connection_struct *conn, uint16 vuid,
 	/* Get the file handle and hence the file name. */
 	/* 
 	 * NB. The setup array has already been transformed
-	 * via SVAL and so is in gost byte order.
+	 * via SVAL and so is in host byte order.
 	 */
 	pnum = ((int)setup[1]) & 0xFFFF;
 	subcommand = ((int)setup[0]) & 0xFFFF;


-- 
Samba Shared Repository