The branch, master has been updated via d72b5a8... s4-smb: fill in fnum as well for root_fid via bdd9dc4... s4-selftest: mark some CIFS backend tests as known fail from dab799e... s4-smbserver: fixed root_fid in nttrans create
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d72b5a81ef86631e89030c8060f1cba90f6a664a Author: Andrew Tridgell <tri...@samba.org> Date: Thu Oct 15 20:50:49 2009 +1100 s4-smb: fill in fnum as well for root_fid This helps with the CIFS NTVFS backend, but doesn't solve all problems commit bdd9dc4a8486919d6ef8c0efba777955ecc5ed33 Author: Andrew Tridgell <tri...@samba.org> Date: Thu Oct 15 20:42:53 2009 +1100 s4-selftest: mark some CIFS backend tests as known fail The CIFS passthru NTVFS doesn't handle some options yet (eg. root_fid) ----------------------------------------------------------------------- Summary of changes: source4/selftest/knownfail | 4 ++++ source4/smb_server/smb/nttrans.c | 3 ++- source4/smb_server/smb/reply.c | 1 + 3 files changed, 7 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail index fcb16c9..7bd4bac 100644 --- a/source4/selftest/knownfail +++ b/source4/selftest/knownfail @@ -58,3 +58,7 @@ samba4.winbind.struct.*.LOOKUP_NAME_SID # Not yet working in winbind ^samba4.ldap.python \(dc\).Test add_ldif\(\) with BASE64 security descriptor input using WRONG domain SID$ ^samba4.ldap.python \(dc\).Testing ldb.add_ldif\(\) for nTSecurityDescriptor ^samba4.ldap.secdesc.python +# some operations don't work over the CIFS NTVFS backend yet (eg. root_fid) +samba4.ntvfs.cifs.base.createx_access +samba4.ntvfs.cifs.base.createx_sharemodes_dir +samba4.ntvfs.cifs.base.maximum_allowed diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c index 23eb04b..316305a 100644 --- a/source4/smb_server/smb/nttrans.c +++ b/source4/smb_server/smb/nttrans.c @@ -119,7 +119,8 @@ 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.ntvfs = smbsrv_pull_fnum(req, req->in.vwv, 4); + 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); io->ntcreatex.in.file_attr = IVAL(params, 20); diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c index 2c99a38..4baea47 100644 --- a/source4/smb_server/smb/reply.c +++ b/source4/smb_server/smb/reply.c @@ -2216,6 +2216,7 @@ 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