diff options
| author | Jeremy Allison <jra@samba.org> | 2011-05-31 16:36:06 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-06-01 04:06:12 +0200 |
| commit | c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde (patch) | |
| tree | 21939b3dee3e786c9ec4c00eb6b832f2560bd371 /source3/smbd | |
| parent | 1cee71713f75dbee653ea86bd4e7c87efe677cf6 (diff) | |
| download | samba-c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde.tar.gz samba-c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde.tar.bz2 samba-c7d2f6d35a95678c91faf0b5ac7f83bc5d1abfde.zip | |
Remove the char * argument from the SMB_VFS_GETWD() call. Now always
returns malloc'ed memory.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Jun 1 04:06:12 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/vfs.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index 015fc56a78..8c526fa882 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -795,7 +795,7 @@ int vfs_ChDir(connection_struct *conn, const char *path) char *vfs_GetWd(TALLOC_CTX *ctx, connection_struct *conn) { - char s[PATH_MAX+1]; + char *current_dir = NULL; char *result = NULL; DATA_BLOB cache_value; struct file_id key; @@ -803,8 +803,6 @@ char *vfs_GetWd(TALLOC_CTX *ctx, connection_struct *conn) struct smb_filename *smb_fname_full = NULL; NTSTATUS status; - *s = 0; - if (!lp_getwd_cache()) { goto nocache; } @@ -866,7 +864,8 @@ char *vfs_GetWd(TALLOC_CTX *ctx, connection_struct *conn) * systems, or the not quite so bad getwd. */ - if (!SMB_VFS_GETWD(conn,s)) { + current_dir = SMB_VFS_GETWD(conn); + if (current_dir == NULL) { DEBUG(0, ("vfs_GetWd: SMB_VFS_GETWD call failed: %s\n", strerror(errno))); goto out; @@ -877,10 +876,11 @@ char *vfs_GetWd(TALLOC_CTX *ctx, connection_struct *conn) memcache_add(smbd_memcache(), GETWD_CACHE, data_blob_const(&key, sizeof(key)), - data_blob_const(s, strlen(s)+1)); + data_blob_const(current_dir, + strlen(current_dir)+1)); } - result = talloc_strdup(ctx, s); + result = talloc_strdup(ctx, current_dir); if (result == NULL) { errno = ENOMEM; } @@ -888,6 +888,7 @@ char *vfs_GetWd(TALLOC_CTX *ctx, connection_struct *conn) out: TALLOC_FREE(smb_fname_dot); TALLOC_FREE(smb_fname_full); + SAFE_FREE(current_dir); return result; } @@ -1553,10 +1554,10 @@ int smb_vfs_call_chdir(struct vfs_handle_struct *handle, const char *path) return handle->fns->chdir(handle, path); } -char *smb_vfs_call_getwd(struct vfs_handle_struct *handle, char *buf) +char *smb_vfs_call_getwd(struct vfs_handle_struct *handle) { VFS_FIND(getwd); - return handle->fns->getwd(handle, buf); + return handle->fns->getwd(handle); } int smb_vfs_call_ntimes(struct vfs_handle_struct *handle, |