diff options
| author | Jeremy Allison <jra@samba.org> | 2000-08-30 18:33:56 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-08-30 18:33:56 +0000 |
| commit | 177b962dfe4c6215424ff2a2e69a4da3cecb3687 (patch) | |
| tree | cdd4e3609c4717fe3787c4ee25652d7a062c3d35 /source3/smbd | |
| parent | 6e150a7ca507869df7b639e1a80ba101b1d5771a (diff) | |
| download | samba-177b962dfe4c6215424ff2a2e69a4da3cecb3687.tar.gz samba-177b962dfe4c6215424ff2a2e69a4da3cecb3687.tar.bz2 samba-177b962dfe4c6215424ff2a2e69a4da3cecb3687.zip | |
Added vfs_unlink call to ensure vfs is used on unlink from client.
Jeremy.
(This used to be commit 38fc56c8434c427335cf264c4b27420c5ad47566)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/reply.c | 2 | ||||
| -rw-r--r-- | source3/smbd/vfs.c | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 00e6f44dd0..7e6a244190 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1888,7 +1888,7 @@ int reply_unlink(connection_struct *conn, char *inbuf,char *outbuf, int dum_size if (!has_wild) { pstrcat(directory,"/"); pstrcat(directory,mask); - if (can_delete(directory,conn,dirtype) && !dos_unlink(directory)) + if (can_delete(directory,conn,dirtype) && !vfs_unlink(conn,directory)) count++; if (!count) exists = vfs_file_exist(conn,directory,NULL); diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index 7c34817351..496d3e0432 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -243,6 +243,15 @@ BOOL vfs_directory_exist(connection_struct *conn, char *dname, } /******************************************************************* + vfs Unlink wrapper that calls dos_to_unix. +********************************************************************/ + +int vfs_unlink(connection_struct *conn, char *fname) +{ + return(conn->vfs_ops.unlink(dos_to_unix(fname,False))); +} + +/******************************************************************* check if a vfs file exists ********************************************************************/ BOOL vfs_file_exist(connection_struct *conn,char *fname,SMB_STRUCT_STAT *sbuf) |