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_cap.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_cap.c')
| -rw-r--r-- | source3/modules/vfs_cap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c index 35fa740dd0..89f16891a9 100644 --- a/source3/modules/vfs_cap.c +++ b/source3/modules/vfs_cap.c @@ -384,7 +384,7 @@ static int cap_mknod(vfs_handle_struct *handle, const char *path, mode_t mode, S return SMB_VFS_NEXT_MKNOD(handle, cappath, mode, dev); } -static char *cap_realpath(vfs_handle_struct *handle, const char *path, char *resolved_path) +static char *cap_realpath(vfs_handle_struct *handle, const char *path) { /* monyo need capencode'ed and capdecode'ed? */ char *cappath = capencode(talloc_tos(), path); @@ -393,7 +393,7 @@ static char *cap_realpath(vfs_handle_struct *handle, const char *path, char *res errno = ENOMEM; return NULL; } - return SMB_VFS_NEXT_REALPATH(handle, path, resolved_path); + return SMB_VFS_NEXT_REALPATH(handle, cappath); } static int cap_chmod_acl(vfs_handle_struct *handle, const char *path, mode_t mode) |