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_catia.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_catia.c')
-rw-r--r-- | source3/modules/vfs_catia.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c index 177458bce2..af6efd28df 100644 --- a/source3/modules/vfs_catia.c +++ b/source3/modules/vfs_catia.c @@ -634,8 +634,7 @@ static int catia_ntimes(vfs_handle_struct *handle, } static char * -catia_realpath(vfs_handle_struct *handle, const char *path, - char *resolved_path) +catia_realpath(vfs_handle_struct *handle, const char *path) { char *mapped_name = NULL; NTSTATUS status; @@ -648,7 +647,7 @@ catia_realpath(vfs_handle_struct *handle, const char *path, return NULL; } - ret = SMB_VFS_NEXT_REALPATH(handle, mapped_name, resolved_path); + ret = SMB_VFS_NEXT_REALPATH(handle, mapped_name); TALLOC_FREE(mapped_name); return ret; |