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_audit.c | 8 ++++---- source3/modules/vfs_cap.c | 6 +++--- source3/modules/vfs_extd_audit.c | 12 ++++++------ source3/modules/vfs_full_audit.c | 8 ++++---- source3/modules/vfs_netatalk.c | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'source3/modules') diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c index 550d918b43..a5b80190c0 100644 --- a/source3/modules/vfs_audit.c +++ b/source3/modules/vfs_audit.c @@ -36,7 +36,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); @@ -190,14 +190,14 @@ 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) : ""); diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c index 18fa04533f..de61f41f3c 100644 --- a/source3/modules/vfs_cap.c +++ b/source3/modules/vfs_cap.c @@ -79,11 +79,11 @@ static int cap_open(vfs_handle_struct *handle, connection_struct *conn, const ch return SMB_VFS_NEXT_OPEN(handle, conn, capname, flags, mode); } -static int cap_rename(vfs_handle_struct *handle, connection_struct *conn, const char *old, const char *new) +static int cap_rename(vfs_handle_struct *handle, connection_struct *conn, const char *oldname, const char *newname) { pstring capold, capnew; - capencode(capold, old); - capencode(capnew, new); + capencode(capold, oldname); + capencode(capnew, newname); return SMB_VFS_NEXT_RENAME(handle, conn, capold, capnew); } 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) : "")); diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 3c0098408e..d2ac9b7c16 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -121,7 +121,7 @@ static ssize_t smb_full_audit_sendfile(vfs_handle_struct *handle, int tofd, const DATA_BLOB *hdr, SMB_OFF_T offset, size_t n); static int smb_full_audit_rename(vfs_handle_struct *handle, connection_struct *conn, - const char *old, const char *new); + const char *oldname, const char *newname); static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp, int fd); static int smb_full_audit_stat(vfs_handle_struct *handle, connection_struct *conn, const char *fname, SMB_STRUCT_STAT *sbuf); @@ -1012,13 +1012,13 @@ static ssize_t smb_full_audit_sendfile(vfs_handle_struct *handle, int tofd, } static int smb_full_audit_rename(vfs_handle_struct *handle, connection_struct *conn, - const char *old, const char *new) + 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); - do_log(SMB_VFS_OP_RENAME, (result >= 0), handle, "%s|%s", old, new); + do_log(SMB_VFS_OP_RENAME, (result >= 0), handle, "%s|%s", oldname, newname); return result; } diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c index 1b36914bbe..7a42598c36 100644 --- a/source3/modules/vfs_netatalk.c +++ b/source3/modules/vfs_netatalk.c @@ -223,7 +223,7 @@ exit_rmdir: /* File operations */ -static int atalk_rename(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *old, const char *new) +static int atalk_rename(struct vfs_handle_struct *handle, struct connection_struct *conn, const char *oldname, const char *newname) { int ret = 0; char *adbl_path = 0; @@ -232,14 +232,14 @@ static int atalk_rename(struct vfs_handle_struct *handle, struct connection_stru SMB_STRUCT_STAT orig_info; TALLOC_CTX *ctx; - ret = SMB_VFS_NEXT_RENAME(handle, conn, old, new); + ret = SMB_VFS_NEXT_RENAME(handle, conn, oldname, newname); - if (!conn || !old) return ret; + if (!conn || !oldname) return ret; if (!(ctx = talloc_init("rename_file"))) return ret; - if (atalk_build_paths(ctx, conn->origpath, old, &adbl_path, &orig_path, + if (atalk_build_paths(ctx, conn->origpath, oldname, &adbl_path, &orig_path, &adbl_info, &orig_info) != 0) return ret; -- cgit