[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  740d4d7 s3: files_struct->mode is only written, remove it
      from  4d58d0f tdb: build and run unit tests in tdb/test/

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


- Log -----------------------------------------------------------------
commit 740d4d75500ac1ac224deb67cb3f20a21addb64b
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Feb 14 17:37:09 2012 +0100

    s3: files_struct->mode is only written, remove it
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Tue Feb 14 19:14:29 CET 2012 on sn-devel-104

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

Summary of changes:
 source3/include/smb.h           |    1 -
 source3/printing/printspoolss.c |    1 -
 source3/smbd/files.c            |    1 -
 source3/smbd/open.c             |    2 --
 4 files changed, 0 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 11a05f9..22653cd 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -233,7 +233,6 @@ typedef struct files_struct {
 	unsigned int num_smb_operations;
 	struct file_id file_id;
 	uint64_t initial_allocation_size; /* Faked up initial allocation on disk. */
-	mode_t mode;
 	uint16 file_pid;
 	uint16 vuid;
 	write_cache *wcp;
diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c
index 75e9cad..32f33c6 100644
--- a/source3/printing/printspoolss.c
+++ b/source3/printing/printspoolss.c
@@ -189,7 +189,6 @@ NTSTATUS print_spool_open(files_struct *fsp,
 	}
 
 	fsp->file_id = vfs_file_id_from_sbuf(fsp->conn, &fsp->fsp_name->st);
-	fsp->mode = fsp->fsp_name->st.st_ex_mode;
 	fsp->fh->fd = fd;
 
 	fsp->vuid = current_vuid;
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 66ccb28..4a8967e 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -565,7 +565,6 @@ NTSTATUS dup_file_fsp(struct smb_request *req, files_struct *from,
 
 	to->file_id = from->file_id;
 	to->initial_allocation_size = from->initial_allocation_size;
-	to->mode = from->mode;
 	to->file_pid = from->file_pid;
 	to->vuid = from->vuid;
 	to->open_time = from->open_time;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a94a02e..daa9bb9 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -779,7 +779,6 @@ static NTSTATUS open_file(files_struct *fsp,
 		return NT_STATUS_FILE_IS_A_DIRECTORY;
 	}
 
-	fsp->mode = smb_fname->st.st_ex_mode;
 	fsp->file_id = vfs_file_id_from_sbuf(conn, &smb_fname->st);
 	fsp->vuid = req ? req->vuid : UID_FIELD_INVALID;
 	fsp->file_pid = req ? req->smbpid : 0;
@@ -2819,7 +2818,6 @@ static NTSTATUS open_directory(connection_struct *conn,
 	 * Setup the files_struct for it.
 	 */
 
-	fsp->mode = smb_dname->st.st_ex_mode;
 	fsp->file_id = vfs_file_id_from_sbuf(conn, &smb_dname->st);
 	fsp->vuid = req ? req->vuid : UID_FIELD_INVALID;
 	fsp->file_pid = req ? req->smbpid : 0;


-- 
Samba Shared Repository