svn commit: samba r3670 - in branches/SAMBA_3_0/source: modules smbd

[jra at samba.org]

Author: jra
Date: 2004-11-10 23:02:48 +0000 (Wed, 10 Nov 2004)
New Revision: 3670

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3670

Log:
Warning fixes from Rob Foehl <rwf at loonybin.net>.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/modules/vfs_full_audit.c
   branches/SAMBA_3_0/source/smbd/vfs-wrap.c


Changeset:
Modified: branches/SAMBA_3_0/source/modules/vfs_full_audit.c
===================================================================
--- branches/SAMBA_3_0/source/modules/vfs_full_audit.c	2004-11-10 22:21:41 UTC (rev 3669)
+++ branches/SAMBA_3_0/source/modules/vfs_full_audit.c	2004-11-10 23:02:48 UTC (rev 3670)
@@ -86,6 +86,12 @@
 			  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 @@
 	 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 @@
 	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 @@
 	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)
 {

Modified: branches/SAMBA_3_0/source/smbd/vfs-wrap.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/vfs-wrap.c	2004-11-10 22:21:41 UTC (rev 3669)
+++ branches/SAMBA_3_0/source/smbd/vfs-wrap.c	2004-11-10 23:02:48 UTC (rev 3670)
@@ -100,7 +100,7 @@
 
 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);