summaryrefslogtreecommitdiff
path: root/source3/include/vfs_macros.h
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-11-19 16:29:26 -0800
committerJeremy Allison <jra@samba.org>2010-11-20 02:15:50 +0100
commit2b788aa6ce41c5c0a6892cb412cf40a7cbc73f2a (patch)
tree38d9b916b7f46705d0fe027e86ccef413b5b2374 /source3/include/vfs_macros.h
parent8585de88815490ed3c41571030bf20bff02a67d4 (diff)
downloadsamba-2b788aa6ce41c5c0a6892cb412cf40a7cbc73f2a.tar.gz
samba-2b788aa6ce41c5c0a6892cb412cf40a7cbc73f2a.tar.bz2
samba-2b788aa6ce41c5c0a6892cb412cf40a7cbc73f2a.zip
Move the uglyness of #ifdef REALPATH_TAKES_NULL into the vfs_default
module, change the signature of VFS_REALPATH to always return a malloc'ed string. Needed to make some privileges work I plan on doing shortly easier to code. Jeremy. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Sat Nov 20 02:15:50 CET 2010 on sn-devel-104
Diffstat (limited to 'source3/include/vfs_macros.h')
-rw-r--r--source3/include/vfs_macros.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 4472e3a52a..5b38e64cbf 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -289,10 +289,10 @@
#define SMB_VFS_NEXT_MKNOD(handle, path, mode, dev) \
smb_vfs_call_mknod((handle)->next, (path), (mode), (dev))
-#define SMB_VFS_REALPATH(conn, path, resolved_path) \
- smb_vfs_call_realpath((conn)->vfs_handles, (path), (resolved_path))
-#define SMB_VFS_NEXT_REALPATH(handle, path, resolved_path) \
- smb_vfs_call_realpath((handle)->next, (path), (resolved_path))
+#define SMB_VFS_REALPATH(conn, path) \
+ smb_vfs_call_realpath((conn)->vfs_handles, (path))
+#define SMB_VFS_NEXT_REALPATH(handle, path) \
+ smb_vfs_call_realpath((handle)->next, (path))
#define SMB_VFS_NOTIFY_WATCH(conn, ctx, e, callback, private_data, handle_p) \
smb_vfs_call_notify_watch((conn)->vfs_handles, (ctx), (e), (callback), (private_data), (handle_p))