diff options
| author | Alexander Bokovoy <ab@samba.org> | 2008-04-21 11:38:20 +0400 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2008-04-21 11:38:20 +0400 |
| commit | ff615f232968979f57a31f43a4f668c2c4fd20df (patch) | |
| tree | 8e4d6e1181001dd35e32008a3401020c013e288b /source3/modules/vfs_extd_audit.c | |
| parent | 09caab9f37d6ecd4fd6fe9ce3c284730b232651a (diff) | |
| parent | 0db7aba8af80a01150d1061a4192ab814e4234b7 (diff) | |
| download | samba-ff615f232968979f57a31f43a4f668c2c4fd20df.tar.gz samba-ff615f232968979f57a31f43a4f668c2c4fd20df.tar.bz2 samba-ff615f232968979f57a31f43a4f668c2c4fd20df.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 2c3ffc1c53550c8e6feeca8fc0270ef9ac1ec70a)
Diffstat (limited to 'source3/modules/vfs_extd_audit.c')
| -rw-r--r-- | source3/modules/vfs_extd_audit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c index 926ec36259..7516cba1d3 100644 --- a/source3/modules/vfs_extd_audit.c +++ b/source3/modules/vfs_extd_audit.c @@ -37,7 +37,7 @@ static SMB_STRUCT_DIR *audit_opendir(vfs_handle_struct *handle, const char *fnam static int audit_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode); static int audit_rmdir(vfs_handle_struct *handle, const char *path); static int audit_open(vfs_handle_struct *handle, const char *fname, files_struct *fsp, int flags, mode_t mode); -static int audit_close(vfs_handle_struct *handle, files_struct *fsp, int fd); +static int audit_close(vfs_handle_struct *handle, files_struct *fsp); static int audit_rename(vfs_handle_struct *handle, const char *oldname, const char *newname); static int audit_unlink(vfs_handle_struct *handle, const char *path); static int audit_chmod(vfs_handle_struct *handle, const char *path, mode_t mode); @@ -224,18 +224,18 @@ static int audit_open(vfs_handle_struct *handle, const char *fname, files_struct return result; } -static int audit_close(vfs_handle_struct *handle, files_struct *fsp, int fd) +static int audit_close(vfs_handle_struct *handle, files_struct *fsp) { int result; - result = SMB_VFS_NEXT_CLOSE(handle, fsp, fd); + result = SMB_VFS_NEXT_CLOSE(handle, fsp); syslog(audit_syslog_priority(handle), "close fd %d %s%s\n", - fd, + fsp->fh->fd, (result < 0) ? "failed: " : "", (result < 0) ? strerror(errno) : ""); DEBUG(2, ("vfs_extd_audit: close fd %d %s %s\n", - fd, + fsp->fh->fd, (result < 0) ? "failed: " : "", (result < 0) ? strerror(errno) : "")); |