From 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 24 Jun 2005 20:25:18 +0000 Subject: r7882: Looks like a large patch - but what it actually does is make Samba safe for using our headers and linking with C++ modules. Stops us from using C++ reserved keywords in our code. Jeremy (This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a) --- source3/modules/vfs_extd_audit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/modules/vfs_extd_audit.c') diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c index 06cddc78e4..6115c97776 100644 --- a/source3/modules/vfs_extd_audit.c +++ b/source3/modules/vfs_extd_audit.c @@ -39,7 +39,7 @@ static int audit_mkdir(vfs_handle_struct *handle, connection_struct *conn, const static int audit_rmdir(vfs_handle_struct *handle, connection_struct *conn, const char *path); static int audit_open(vfs_handle_struct *handle, connection_struct *conn, const char *fname, int flags, mode_t mode); static int audit_close(vfs_handle_struct *handle, files_struct *fsp, int fd); -static int audit_rename(vfs_handle_struct *handle, connection_struct *conn, const char *old, const char *new); +static int audit_rename(vfs_handle_struct *handle, connection_struct *conn, const char *oldname, const char *newname); static int audit_unlink(vfs_handle_struct *handle, connection_struct *conn, const char *path); static int audit_chmod(vfs_handle_struct *handle, connection_struct *conn, const char *path, mode_t mode); static int audit_chmod_acl(vfs_handle_struct *handle, connection_struct *conn, const char *name, mode_t mode); @@ -216,18 +216,18 @@ static int audit_close(vfs_handle_struct *handle, files_struct *fsp, int fd) return result; } -static int audit_rename(vfs_handle_struct *handle, connection_struct *conn, const char *old, const char *new) +static int audit_rename(vfs_handle_struct *handle, connection_struct *conn, const char *oldname, const char *newname) { int result; - result = SMB_VFS_NEXT_RENAME(handle, conn, old, new); + result = SMB_VFS_NEXT_RENAME(handle, conn, oldname, newname); syslog(audit_syslog_priority(handle), "rename %s -> %s %s%s\n", - old, new, + oldname, newname, (result < 0) ? "failed: " : "", (result < 0) ? strerror(errno) : ""); - DEBUG(1, ("vfs_extd_audit: rename old: %s new: %s %s %s\n", - old, new, + DEBUG(1, ("vfs_extd_audit: rename old: %s newname: %s %s %s\n", + oldname, newname, (result < 0) ? "failed: " : "", (result < 0) ? strerror(errno) : "")); -- cgit