[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  46b7938... s4-smbserver: removed bogus initialisation of two union arms
      from  bf6fcc6... s4-pvfs: when uwrap is enabled, ignore chown errors

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


- Log -----------------------------------------------------------------
commit 46b7938d7e66c2ce25e605cd7c579f905c146616
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sat Oct 17 13:12:24 2009 +1100

    s4-smbserver: removed bogus initialisation of two union arms
    
    Thanks to Metze for spotting this.

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

Summary of changes:
 source4/smb_server/smb/nttrans.c |    1 -
 source4/smb_server/smb/reply.c   |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c
index 316305a..91b6aba 100644
--- a/source4/smb_server/smb/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
@@ -119,7 +119,6 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req,
 	params = trans->in.params.data;
 
 	io->ntcreatex.in.flags            = IVAL(params,  0);
-	io->ntcreatex.in.root_fid.fnum    = IVAL(params,  4);
 	io->ntcreatex.in.root_fid.ntvfs   = smbsrv_pull_fnum(req, params, 4);
 	io->ntcreatex.in.access_mask      = IVAL(params,  8);
 	io->ntcreatex.in.alloc_size       = BVAL(params, 12);
diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index 4baea47..2c99a38 100644
--- a/source4/smb_server/smb/reply.c
+++ b/source4/smb_server/smb/reply.c
@@ -2216,7 +2216,6 @@ void smbsrv_reply_ntcreate_and_X(struct smbsrv_request *req)
 	/* notice that the word parameters are not word aligned, so we don't use VWV() */
 	fname_len =                         SVAL(req->in.vwv, 5);
 	io->ntcreatex.in.flags =            IVAL(req->in.vwv, 7);
-	io->ntcreatex.in.root_fid.fnum  =   IVAL(req->in.vwv, 11);
 	io->ntcreatex.in.root_fid.ntvfs =   smbsrv_pull_fnum(req, req->in.vwv, 11);
 	io->ntcreatex.in.access_mask =      IVAL(req->in.vwv, 15);
 	io->ntcreatex.in.alloc_size =       BVAL(req->in.vwv, 19);


-- 
Samba Shared Repository