diff options
| author | Jeremy Allison <jra@samba.org> | 2004-11-10 23:02:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:12 -0500 |
| commit | e87470fa3fa557c3fbf0f59f4c3a91d9a468fa0e (patch) | |
| tree | b82c67863eaa9c1f62d5378337b485311ea04dfc | |
| parent | f23d3c2cfc99adf93994fe2db23274f382f7470e (diff) | |
| download | samba-e87470fa3fa557c3fbf0f59f4c3a91d9a468fa0e.tar.gz samba-e87470fa3fa557c3fbf0f59f4c3a91d9a468fa0e.tar.bz2 samba-e87470fa3fa557c3fbf0f59f4c3a91d9a468fa0e.zip | |
r3670: Warning fixes from Rob Foehl <rwf@loonybin.net>.
Jeremy.
(This used to be commit 54da75ca4cc27dfb0012fd17047702ec2f39cae9)
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 46 | ||||
| -rw-r--r-- | source3/smbd/vfs-wrap.c | 2 |
2 files changed, 45 insertions, 3 deletions
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index e91c1813a8..09215d1e8d 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -86,6 +86,12 @@ static DIR *smb_full_audit_opendir(vfs_handle_struct *handle, connection_struct const char *fname); static SMB_STRUCT_DIRENT *smb_full_audit_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp); +static void smb_full_audit_seekdir(vfs_handle_struct *handle, connection_struct *conn, + DIR *dirp, long offset); +static long smb_full_audit_telldir(vfs_handle_struct *handle, connection_struct *conn, + DIR *dirp); +static void smb_full_audit_rewinddir(vfs_handle_struct *handle, connection_struct *conn, + DIR *dirp); static int smb_full_audit_mkdir(vfs_handle_struct *handle, connection_struct *conn, const char *path, mode_t mode); static int smb_full_audit_rmdir(vfs_handle_struct *handle, connection_struct *conn, @@ -304,6 +310,12 @@ static vfs_op_tuple audit_op_tuples[] = { SMB_VFS_LAYER_LOGGER}, {SMB_VFS_OP(smb_full_audit_readdir), SMB_VFS_OP_READDIR, SMB_VFS_LAYER_LOGGER}, + {SMB_VFS_OP(smb_full_audit_seekdir), SMB_VFS_OP_SEEKDIR, + SMB_VFS_LAYER_LOGGER}, + {SMB_VFS_OP(smb_full_audit_telldir), SMB_VFS_OP_TELLDIR, + SMB_VFS_LAYER_LOGGER}, + {SMB_VFS_OP(smb_full_audit_rewinddir), SMB_VFS_OP_REWINDDIR, + SMB_VFS_LAYER_LOGGER}, {SMB_VFS_OP(smb_full_audit_mkdir), SMB_VFS_OP_MKDIR, SMB_VFS_LAYER_LOGGER}, {SMB_VFS_OP(smb_full_audit_rmdir), SMB_VFS_OP_RMDIR, @@ -788,10 +800,10 @@ static DIR *smb_full_audit_opendir(vfs_handle_struct *handle, connection_struct return result; } -static struct dirent *smb_full_audit_readdir(vfs_handle_struct *handle, +static SMB_STRUCT_DIRENT *smb_full_audit_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp) { - struct dirent *result; + SMB_STRUCT_DIRENT *result; result = SMB_VFS_NEXT_READDIR(handle, conn, dirp); @@ -803,6 +815,36 @@ static struct dirent *smb_full_audit_readdir(vfs_handle_struct *handle, return result; } +static void smb_full_audit_seekdir(vfs_handle_struct *handle, connection_struct *conn, + DIR *dirp, long offset) +{ + SMB_VFS_NEXT_SEEKDIR(handle, conn, dirp, offset); + + do_log(SMB_VFS_OP_SEEKDIR, True, handle, ""); + return; +} + +static long smb_full_audit_telldir(vfs_handle_struct *handle, connection_struct *conn, + DIR *dirp) +{ + long result; + + result = SMB_VFS_NEXT_TELLDIR(handle, conn, dirp); + + do_log(SMB_VFS_OP_OPENDIR, True, handle, ""); + + return result; +} + +static void smb_full_audit_rewinddir(vfs_handle_struct *handle, connection_struct *conn, + DIR *dirp) +{ + SMB_VFS_NEXT_REWINDDIR(handle, conn, dirp); + + do_log(SMB_VFS_OP_REWINDDIR, True, handle, ""); + return; +} + static int smb_full_audit_mkdir(vfs_handle_struct *handle, connection_struct *conn, const char *path, mode_t mode) { diff --git a/source3/smbd/vfs-wrap.c b/source3/smbd/vfs-wrap.c index 1444d0e875..abc17a37a2 100644 --- a/source3/smbd/vfs-wrap.c +++ b/source3/smbd/vfs-wrap.c @@ -100,7 +100,7 @@ DIR *vfswrap_opendir(vfs_handle_struct *handle, connection_struct *conn, const c SMB_STRUCT_DIRENT *vfswrap_readdir(vfs_handle_struct *handle, connection_struct *conn, DIR *dirp) { - struct dirent *result; + SMB_STRUCT_DIRENT *result; START_PROFILE(syscall_readdir); result = sys_readdir(dirp); |