summaryrefslogtreecommitdiff
path: root/source3/smbd/close.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-02-09 16:31:06 -0800
committerJeremy Allison <jra@samba.org>2011-02-10 02:43:31 +0100
commit0122a4f41744c36aa97d73c060cfb952d2fdbc2d (patch)
tree71d4aaf2ba7c86d083bffc65323d5600715bd4ef /source3/smbd/close.c
parent4b0af9be9a887b78a71eda26d418546330889ed1 (diff)
downloadsamba-0122a4f41744c36aa97d73c060cfb952d2fdbc2d.tar.gz
samba-0122a4f41744c36aa97d73c060cfb952d2fdbc2d.tar.bz2
samba-0122a4f41744c36aa97d73c060cfb952d2fdbc2d.zip
Put OpenDir() back the way it was - don't overload with an fsp arg. Create OpenDir_fsp for new usage.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Thu Feb 10 02:43:31 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/smbd/close.c')
-rw-r--r--source3/smbd/close.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 60cf8ed945..d5a824f868 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -699,7 +699,7 @@ static bool recursive_rmdir(TALLOC_CTX *ctx,
SMB_ASSERT(!is_ntfs_stream_smb_fname(smb_dname));
- dir_hnd = OpenDir(talloc_tos(), conn, NULL, smb_dname->base_name, NULL, 0);
+ dir_hnd = OpenDir(talloc_tos(), conn, smb_dname->base_name, NULL, 0);
if(dir_hnd == NULL)
return False;
@@ -817,7 +817,6 @@ static NTSTATUS rmdir_internals(TALLOC_CTX *ctx, files_struct *fsp)
char *talloced = NULL;
long dirpos = 0;
struct smb_Dir *dir_hnd = OpenDir(talloc_tos(), conn,
- NULL,
smb_dname->base_name, NULL,
0);