diff options
| -rw-r--r-- | source4/ntvfs/posix/config.mk | 1 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_ioctl.c | 87 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_write.c | 3 | ||||
| -rw-r--r-- | source4/ntvfs/posix/vfs_posix.c | 15 |
4 files changed, 97 insertions, 9 deletions
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk index 8d28bd5a44..4918ee61eb 100644 --- a/source4/ntvfs/posix/config.mk +++ b/source4/ntvfs/posix/config.mk @@ -23,6 +23,7 @@ ADD_OBJ_FILES = \ ntvfs/posix/pvfs_lock.o \ ntvfs/posix/pvfs_wait.o \ ntvfs/posix/pvfs_seek.o \ + ntvfs/posix/pvfs_ioctl.o \ ntvfs/common/opendb.o \ ntvfs/common/brlock.o # End MODULE ntvfs_posix diff --git a/source4/ntvfs/posix/pvfs_ioctl.c b/source4/ntvfs/posix/pvfs_ioctl.c new file mode 100644 index 0000000000..15b9d6c27a --- /dev/null +++ b/source4/ntvfs/posix/pvfs_ioctl.c @@ -0,0 +1,87 @@ +/* + Unix SMB/CIFS implementation. + + POSIX NTVFS backend - open and close + + Copyright (C) Andrew Tridgell 2004 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "include/includes.h" +#include "vfs_posix.h" + +/* + old ioctl interface +*/ +static NTSTATUS pvfs_ioctl_old(struct ntvfs_module_context *ntvfs, + struct smbsrv_request *req, union smb_ioctl *io) +{ + struct pvfs_state *pvfs = ntvfs->private_data; + struct pvfs_file *f; + + f = pvfs_find_fd(pvfs, req, io->ioctl.in.fnum); + if (!f) { + return NT_STATUS_INVALID_HANDLE; + } + + return NT_STATUS_NOT_SUPPORTED; +} + +/* + nt ioctl interface +*/ +static NTSTATUS pvfs_ntioctl(struct ntvfs_module_context *ntvfs, + struct smbsrv_request *req, union smb_ioctl *io) +{ + struct pvfs_state *pvfs = ntvfs->private_data; + struct pvfs_file *f; + + f = pvfs_find_fd(pvfs, req, io->ntioctl.in.fnum); + if (!f) { + return NT_STATUS_INVALID_HANDLE; + } + + switch (io->ntioctl.in.function) { + case FSCTL_SET_SPARSE: + /* maybe some posix systems have a way of marking + a file non-sparse? */ + return NT_STATUS_OK; + } + + return NT_STATUS_NOT_SUPPORTED; +} + +/* + ioctl interface +*/ +NTSTATUS pvfs_ioctl(struct ntvfs_module_context *ntvfs, + struct smbsrv_request *req, union smb_ioctl *io) +{ + NTSTATUS status; + + switch (io->generic.level) { + case RAW_IOCTL_IOCTL: + status = pvfs_ioctl_old(ntvfs, req, io); + break; + + case RAW_IOCTL_NTIOCTL: + status = pvfs_ntioctl(ntvfs, req, io); + break; + } + + return status; +} + diff --git a/source4/ntvfs/posix/pvfs_write.c b/source4/ntvfs/posix/pvfs_write.c index 7ab1d340bd..235a21882a 100644 --- a/source4/ntvfs/posix/pvfs_write.c +++ b/source4/ntvfs/posix/pvfs_write.c @@ -65,6 +65,9 @@ NTSTATUS pvfs_write(struct ntvfs_module_context *ntvfs, wr->writex.in.count, wr->writex.in.offset); if (ret == -1) { + if (errno == EFBIG) { + return NT_STATUS_INVALID_PARAMETER; + } return map_nt_error_from_unix(errno); } diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index cd41bf2329..b83e4c494e 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -122,6 +122,12 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs, pvfs_setup_options(pvfs); +#ifdef SIGXFSZ + /* who had the stupid idea to generate a signal on a large + file write instead of just failing it!? */ + BlockSignals(True, SIGXFSZ); +#endif + return NT_STATUS_OK; } @@ -135,15 +141,6 @@ static NTSTATUS pvfs_disconnect(struct ntvfs_module_context *ntvfs, } /* - ioctl interface - we don't do any -*/ -static NTSTATUS pvfs_ioctl(struct ntvfs_module_context *ntvfs, - struct smbsrv_request *req, union smb_ioctl *io) -{ - return NT_STATUS_INVALID_PARAMETER; -} - -/* check if a directory exists */ static NTSTATUS pvfs_chkpath(struct ntvfs_module_context *ntvfs, |