*/
#include "includes.h"
+#include "smbd/smbd.h"
+#include "system/filesys.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
const char *fname,
char **adbl_path, char **orig_path,
SMB_STRUCT_STAT *adbl_info,
- SMB_STRUCT_STAT *orig_info,
- bool fake_dir_create_times);
+ SMB_STRUCT_STAT *orig_info);
static int atalk_unlink_file(const char *path);
const char *fname,
char **adbl_path, char **orig_path,
SMB_STRUCT_STAT *adbl_info,
- SMB_STRUCT_STAT *orig_info,
- bool fake_dir_create_times)
+ SMB_STRUCT_STAT *orig_info)
{
int ptr0 = 0;
int ptr1 = 0;
#if 0
DEBUG(3, ("ATALK: PATH: %s[%s]\n", path, fname));
#endif
- if (strstr(path, APPLEDOUBLE) || strstr(fname, APPLEDOUBLE)) {
+ if (strstr_m(path, APPLEDOUBLE) || strstr_m(fname, APPLEDOUBLE)) {
DEBUG(3, ("ATALK: path %s[%s] already contains %s\n", path, fname, APPLEDOUBLE));
return -1;
}
/* get pointer to last '/' */
ptr1 = atalk_get_path_ptr(*orig_path);
- sys_lstat(*orig_path, orig_info, fake_dir_create_times);
+ sys_lstat(*orig_path, orig_info, false);
if (S_ISDIR(orig_info->st_ex_mode)) {
*adbl_path = talloc_asprintf(ctx, "%s/%s/%s/",
#if 0
DEBUG(3, ("ATALK: DEBUG:\n%s\n%s\n", *orig_path, *adbl_path));
#endif
- sys_lstat(*adbl_path, adbl_info, fake_dir_create_times);
+ sys_lstat(*adbl_path, adbl_info, false);
return 0;
}
if (cur_list) {
for (i = 0, count = 0; cur_list[i].name; i ++, count ++) {
- if (strstr(cur_list[i].name, APPLEDOUBLE))
+ if (strstr_m(cur_list[i].name, APPLEDOUBLE))
return;
}
}
- if (!(new_list = SMB_CALLOC_ARRAY(name_compare_entry, (count == 0 ? 1 : count + 1))))
+ if (!(new_list = SMB_CALLOC_ARRAY(name_compare_entry, count + 2)))
return;
for (i = 0; i < count; i ++) {
static void atalk_rrmdir(TALLOC_CTX *ctx, char *path)
{
char *dpath;
- SMB_STRUCT_DIRENT *dent = 0;
- SMB_STRUCT_DIR *dir;
+ struct dirent *dent = 0;
+ DIR *dir;
if (!path) return;
- dir = sys_opendir(path);
+ dir = opendir(path);
if (!dir) return;
- while (NULL != (dent = sys_readdir(dir))) {
+ while (NULL != (dent = readdir(dir))) {
if (strcmp(dent->d_name, ".") == 0 ||
strcmp(dent->d_name, "..") == 0)
continue;
atalk_unlink_file(dpath);
}
- sys_closedir(dir);
+ closedir(dir);
}
/* Disk operations */
/* Directory operations */
-static SMB_STRUCT_DIR *atalk_opendir(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
+static DIR *atalk_opendir(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32_t attr)
{
- SMB_STRUCT_DIR *ret = 0;
+ DIR *ret = 0;
ret = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
return ret;
}
+static DIR *atalk_fdopendir(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32_t attr)
+{
+ DIR *ret = 0;
+
+ ret = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
+
+ if (ret == NULL) {
+ return ret;
+ }
+
+ /*
+ * when we try to perform delete operation upon file which has fork
+ * in ./.AppleDouble and this directory wasn't hidden by Samba,
+ * MS Windows explorer causes the error: "Cannot find the specified file"
+ * There is some workaround to avoid this situation, i.e. if
+ * connection has not .AppleDouble entry in either veto or hide
+ * list then it would be nice to add one.
+ */
+
+ atalk_add_to_list(&handle->conn->hide_list);
+ atalk_add_to_list(&handle->conn->veto_list);
+
+ return ret;
+}
+
static int atalk_rmdir(struct vfs_handle_struct *handle, const char *path)
{
bool add = False;
TALLOC_CTX *ctx = 0;
char *dpath;
- if (!handle->conn->origpath || !path) goto exit_rmdir;
+ if (!handle->conn->cwd || !path) goto exit_rmdir;
/* due to there is no way to change bDeleteVetoFiles variable
* from this module, gotta use talloc stuff..
*/
- strstr(path, APPLEDOUBLE) ? (add = False) : (add = True);
+ strstr_m(path, APPLEDOUBLE) ? (add = False) : (add = True);
if (!(ctx = talloc_init("remove_directory")))
goto exit_rmdir;
if (!(dpath = talloc_asprintf(ctx, "%s/%s%s",
- handle->conn->origpath, path, add ? "/"APPLEDOUBLE : "")))
+ handle->conn->cwd, path, add ? "/"APPLEDOUBLE : "")))
goto exit_rmdir;
atalk_rrmdir(ctx, dpath);
return ret;
}
- if (atalk_build_paths(talloc_tos(), handle->conn->origpath, oldname,
+ if (atalk_build_paths(talloc_tos(), handle->conn->cwd, oldname,
&adbl_path, &orig_path, &adbl_info,
- &orig_info, false) != 0)
+ &orig_info) != 0)
goto exit_rename;
if (S_ISDIR(orig_info.st_ex_mode) || S_ISREG(orig_info.st_ex_mode)) {
if (!handle->conn->hide_list) return ret;
for (i = 0; handle->conn->veto_list[i].name; i ++) {
- if (strstr(handle->conn->veto_list[i].name, APPLEDOUBLE))
+ if (strstr_m(handle->conn->veto_list[i].name, APPLEDOUBLE))
break;
}
if (!handle->conn->veto_list[i].name) {
for (i = 0; handle->conn->hide_list[i].name; i ++) {
- if (strstr(handle->conn->hide_list[i].name, APPLEDOUBLE))
+ if (strstr_m(handle->conn->hide_list[i].name, APPLEDOUBLE))
break;
else {
DEBUG(3, ("ATALK: %s is not hidden, skipped..\n",
}
}
- if (atalk_build_paths(talloc_tos(), handle->conn->origpath, path,
+ if (atalk_build_paths(talloc_tos(), handle->conn->cwd, path,
&adbl_path, &orig_path,
- &adbl_info, &orig_info, false) != 0)
+ &adbl_info, &orig_info) != 0)
goto exit_unlink;
if (S_ISDIR(orig_info.st_ex_mode) || S_ISREG(orig_info.st_ex_mode)) {
if (!(ctx = talloc_init("chmod_file")))
return ret;
- if (atalk_build_paths(ctx, handle->conn->origpath, path, &adbl_path,
- &orig_path, &adbl_info, &orig_info,
- false) != 0)
+ if (atalk_build_paths(ctx, handle->conn->cwd, path, &adbl_path,
+ &orig_path, &adbl_info, &orig_info) != 0)
goto exit_chmod;
if (!S_ISDIR(orig_info.st_ex_mode) && !S_ISREG(orig_info.st_ex_mode)) {
if (!(ctx = talloc_init("chown_file")))
return ret;
- if (atalk_build_paths(ctx, handle->conn->origpath, path,
+ if (atalk_build_paths(ctx, handle->conn->cwd, path,
&adbl_path, &orig_path,
- &adbl_info, &orig_info, false) != 0)
+ &adbl_info, &orig_info) != 0)
goto exit_chown;
if (!S_ISDIR(orig_info.st_ex_mode) && !S_ISREG(orig_info.st_ex_mode)) {
if (!(ctx = talloc_init("lchown_file")))
return ret;
- if (atalk_build_paths(ctx, handle->conn->origpath, path,
+ if (atalk_build_paths(ctx, handle->conn->cwd, path,
&adbl_path, &orig_path,
- &adbl_info, &orig_info, false) != 0)
+ &adbl_info, &orig_info) != 0)
goto exit_lchown;
if (!S_ISDIR(orig_info.st_ex_mode) && !S_ISREG(orig_info.st_ex_mode)) {
}
static struct vfs_fn_pointers vfs_netatalk_fns = {
- .opendir = atalk_opendir,
- .rmdir = atalk_rmdir,
- .rename = atalk_rename,
- .unlink = atalk_unlink,
- .chmod = atalk_chmod,
- .chown = atalk_chown,
- .lchown = atalk_lchown,
+ .opendir_fn = atalk_opendir,
+ .fdopendir_fn = atalk_fdopendir,
+ .rmdir_fn = atalk_rmdir,
+ .rename_fn = atalk_rename,
+ .unlink_fn = atalk_unlink,
+ .chmod_fn = atalk_chmod,
+ .chown_fn = atalk_chown,
+ .lchown_fn = atalk_lchown,
};
NTSTATUS vfs_netatalk_init(void);