mirror of
https://github.com/samba-team/samba.git
synced 2025-10-25 19:33:18 +03:00
r15018: Merge Volker's ipc/trans2/nttrans changes over
into 3.0. Also merge the new POSIX lock code - this
is not enabled unless -DDEVELOPER is defined.
This doesn't yet map onto underlying system POSIX
locks. Updates vfs to allow lock queries.
Jeremy.
(This used to be commit 08e52ead03)
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
0f985dcb19
commit
22dbd67708
@@ -161,6 +161,8 @@ static int smb_full_audit_ftruncate(vfs_handle_struct *handle, files_struct *fsp
|
||||
int fd, SMB_OFF_T len);
|
||||
static BOOL smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp, int fd,
|
||||
int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
|
||||
static BOOL smb_full_audit_getlock(vfs_handle_struct *handle, files_struct *fsp, int fd,
|
||||
SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid);
|
||||
static int smb_full_audit_symlink(vfs_handle_struct *handle, connection_struct *conn,
|
||||
const char *oldpath, const char *newpath);
|
||||
static int smb_full_audit_readlink(vfs_handle_struct *handle, connection_struct *conn,
|
||||
@@ -399,6 +401,8 @@ static vfs_op_tuple audit_op_tuples[] = {
|
||||
SMB_VFS_LAYER_LOGGER},
|
||||
{SMB_VFS_OP(smb_full_audit_lock), SMB_VFS_OP_LOCK,
|
||||
SMB_VFS_LAYER_LOGGER},
|
||||
{SMB_VFS_OP(smb_full_audit_getlock), SMB_VFS_OP_GETLOCK,
|
||||
SMB_VFS_LAYER_LOGGER},
|
||||
{SMB_VFS_OP(smb_full_audit_symlink), SMB_VFS_OP_SYMLINK,
|
||||
SMB_VFS_LAYER_LOGGER},
|
||||
{SMB_VFS_OP(smb_full_audit_readlink), SMB_VFS_OP_READLINK,
|
||||
@@ -564,6 +568,7 @@ static struct {
|
||||
{ SMB_VFS_OP_UTIME, "utime" },
|
||||
{ SMB_VFS_OP_FTRUNCATE, "ftruncate" },
|
||||
{ SMB_VFS_OP_LOCK, "lock" },
|
||||
{ SMB_VFS_OP_GETLOCK, "getlock" },
|
||||
{ SMB_VFS_OP_SYMLINK, "symlink" },
|
||||
{ SMB_VFS_OP_READLINK, "readlink" },
|
||||
{ SMB_VFS_OP_LINK, "link" },
|
||||
@@ -1313,6 +1318,18 @@ static BOOL smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp, in
|
||||
return result;
|
||||
}
|
||||
|
||||
static BOOL smb_full_audit_getlock(vfs_handle_struct *handle, files_struct *fsp, int fd,
|
||||
SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
|
||||
{
|
||||
BOOL result;
|
||||
|
||||
result = SMB_VFS_NEXT_GETLOCK(handle, fsp, fd, poffset, pcount, ptype, ppid);
|
||||
|
||||
do_log(SMB_VFS_OP_GETLOCK, (result >= 0), handle, "%s", fsp->fsp_name);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static int smb_full_audit_symlink(vfs_handle_struct *handle, connection_struct *conn,
|
||||
const char *oldpath, const char *newpath)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user