diff options
| author | Jeremy Allison <jra@samba.org> | 2010-11-19 16:29:26 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-11-20 02:15:50 +0100 |
| commit | 2b788aa6ce41c5c0a6892cb412cf40a7cbc73f2a (patch) | |
| tree | 38d9b916b7f46705d0fe027e86ccef413b5b2374 /source3/modules/vfs_shadow_copy2.c | |
| parent | 8585de88815490ed3c41571030bf20bff02a67d4 (diff) | |
| download | samba-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/modules/vfs_shadow_copy2.c')
| -rw-r--r-- | source3/modules/vfs_shadow_copy2.c | 6 |
1 files changed, 3 insertions, 3 deletions
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, |