From 2b788aa6ce41c5c0a6892cb412cf40a7cbc73f2a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 19 Nov 2010 16:29:26 -0800 Subject: 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 Autobuild-Date: Sat Nov 20 02:15:50 CET 2010 on sn-devel-104 --- source3/modules/vfs_shadow_copy2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/modules/vfs_shadow_copy2.c') diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c index 502f815235..ba6b3441b8 100644 --- a/source3/modules/vfs_shadow_copy2.c +++ b/source3/modules/vfs_shadow_copy2.c @@ -653,7 +653,7 @@ static int shadow_copy2_mknod(vfs_handle_struct *handle, } static char *shadow_copy2_realpath(vfs_handle_struct *handle, - const char *fname, char *resolved_path) + const char *fname) { const char *gmt; @@ -671,10 +671,10 @@ static char *shadow_copy2_realpath(vfs_handle_struct *handle, copy[gmt - fname + 1] = '\0'; DEBUG(10, ("calling NEXT_REALPATH with %s\n", copy)); - SHADOW2_NEXT(REALPATH, (handle, name, resolved_path), char *, + SHADOW2_NEXT(REALPATH, (handle, copy), char *, NULL); } - SHADOW2_NEXT(REALPATH, (handle, name, resolved_path), char *, NULL); + SHADOW2_NEXT(REALPATH, (handle, name), char *, NULL); } static const char *shadow_copy2_connectpath(struct vfs_handle_struct *handle, -- cgit