X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Fmodules%2Fvfs_recycle.c;h=327a7eea06e31b8d076f5e4fad72d5148030be15;hb=HEAD;hp=9b31f6afb950bfe073fbc9d5c2d15a0ca830a57f;hpb=487130a6df828c21916ccddc6d3aa66169cd8bb2;p=samba.git

diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 9b31f6afb95..9c0020a8dbe 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -10,7 +10,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -19,11 +19,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "system/filesys.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "auth.h"
+#include "source3/lib/substitute.h"
 
 #define ALLOC_CHECK(ptr, label) do { if ((ptr) == NULL) { DEBUG(0, ("recycle.bin: out of memory!\n")); errno = ENOMEM; goto label; } } while(0)
 
@@ -31,134 +35,172 @@ static int vfs_recycle_debug_level = DBGC_VFS;
 
 #undef DBGC_CLASS
 #define DBGC_CLASS vfs_recycle_debug_level
- 
-static int recycle_connect(vfs_handle_struct *handle, connection_struct *conn, const char *service, const char *user);
-static void recycle_disconnect(vfs_handle_struct *handle, connection_struct *conn);
-static int recycle_unlink(vfs_handle_struct *handle, connection_struct *conn, const char *name);
 
-static vfs_op_tuple recycle_ops[] = {
-
-	/* Disk operations */
-	{SMB_VFS_OP(recycle_connect),	SMB_VFS_OP_CONNECT,	SMB_VFS_LAYER_TRANSPARENT},
-	{SMB_VFS_OP(recycle_disconnect),	SMB_VFS_OP_DISCONNECT,	SMB_VFS_LAYER_TRANSPARENT},
-
-	/* File operations */
-	{SMB_VFS_OP(recycle_unlink),	SMB_VFS_OP_UNLINK,	SMB_VFS_LAYER_TRANSPARENT},
-
-	{SMB_VFS_OP(NULL),		SMB_VFS_OP_NOOP,	SMB_VFS_LAYER_NOOP}
+struct recycle_config_data {
+	const char *repository;
+	bool keeptree;
+	bool versions;
+	bool touch;
+	bool touch_mtime;
+	const char **exclude;
+	const char **exclude_dir;
+	const char **noversions;
+	mode_t directory_mode;
+	mode_t subdir_mode;
+	off_t minsize;
+	off_t maxsize;
 };
 
-static int recycle_connect(vfs_handle_struct *handle, connection_struct *conn, const char *service, const char *user)
-{
-	DEBUG(10,("recycle_connect() connect to service[%s] as user[%s].\n",
-		service,user));
-
-	return SMB_VFS_NEXT_CONNECT(handle, conn, service, user);		
-}
-
-static void recycle_disconnect(vfs_handle_struct *handle, connection_struct *conn)
-{
-	DEBUG(10,("recycle_disconnect() connect to service[%s].\n",
-		lp_servicename(SNUM(conn))));
-
-	SMB_VFS_NEXT_DISCONNECT(handle, conn);	
-}
-
-static const char *recycle_repository(vfs_handle_struct *handle)
-{
-	const char *tmp_str = NULL;
-	
-
-	tmp_str = lp_parm_const_string(SNUM(handle->conn), "recycle", "repository",".recycle");
-
-	DEBUG(10, ("recycle: repository = %s\n", tmp_str));
-	
-	return tmp_str;
-}
-
-static BOOL recycle_keep_dir_tree(vfs_handle_struct *handle)
-{
-	BOOL ret;
-	
-	ret = lp_parm_bool(SNUM(handle->conn), "recycle", "keeptree", False);
-
-	DEBUG(10, ("recycle_bin: keeptree = %s\n", ret?"True":"False"));
-	
-	return ret;
-}
-
-static BOOL recycle_versions(vfs_handle_struct *handle)
-{
-	BOOL ret;
-
-	ret = lp_parm_bool(SNUM(handle->conn), "recycle", "versions", False);
-
-	DEBUG(10, ("recycle: versions = %s\n", ret?"True":"False"));
-	
-	return ret;
-}
-
-static BOOL recycle_touch(vfs_handle_struct *handle)
-{
-	BOOL ret;
-
-	ret = lp_parm_bool(SNUM(handle->conn), "recycle", "touch", False);
-
-	DEBUG(10, ("recycle: touch = %s\n", ret?"True":"False"));
-	
-	return ret;
-}
-
-static const char **recycle_exclude(vfs_handle_struct *handle)
-{
-	const char **tmp_lp;
-	
-	tmp_lp = lp_parm_string_list(SNUM(handle->conn), "recycle", "exclude", NULL);
-
-	DEBUG(10, ("recycle: exclude = %s ...\n", tmp_lp?*tmp_lp:""));
-	
-	return tmp_lp;
-}
-
-static const char **recycle_exclude_dir(vfs_handle_struct *handle)
+static int vfs_recycle_connect(struct vfs_handle_struct *handle,
+			       const char *service,
+			       const char *user)
 {
-	const char **tmp_lp;
-	
-	tmp_lp = lp_parm_string_list(SNUM(handle->conn), "recycle", "exclude_dir", NULL);
-
-	DEBUG(10, ("recycle: exclude_dir = %s ...\n", tmp_lp?*tmp_lp:""));
-	
-	return tmp_lp;
-}
+	const struct loadparm_substitution *lp_sub =
+		loadparm_s3_global_substitution();
+	struct recycle_config_data *config = NULL;
+	int ret;
+	int t;
+	const char *buff = NULL;
+	const char **tmplist = NULL;
+	char *repository = NULL;
 
-static const char **recycle_noversions(vfs_handle_struct *handle)
-{
-	const char **tmp_lp;
-	
-	tmp_lp = lp_parm_string_list(SNUM(handle->conn), "recycle", "noversions", NULL);
+	ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
+	if (ret < 0) {
+		return ret;
+	}
 
-	DEBUG(10, ("recycle: noversions = %s\n", tmp_lp?*tmp_lp:""));
-	
-	return tmp_lp;
-}
+	if (IS_IPC(handle->conn) || IS_PRINT(handle->conn)) {
+		return 0;
+	}
 
-static int recycle_maxsize(vfs_handle_struct *handle)
-{
-	int maxsize;
-	
-	maxsize = lp_parm_int(SNUM(handle->conn), "recycle", "maxsize", -1);
+	config = talloc_zero(handle->conn, struct recycle_config_data);
+	if (config == NULL) {
+		DBG_ERR("talloc_zero() failed\n");
+		errno = ENOMEM;
+		return -1;
+	}
+	buff = lp_parm_const_string(SNUM(handle->conn),
+				    "recycle",
+				    "repository",
+				    ".recycle");
+	repository = talloc_sub_full(
+		config,
+		lp_servicename(talloc_tos(), lp_sub, SNUM(handle->conn)),
+		handle->conn->session_info->unix_info->unix_name,
+		handle->conn->connectpath,
+		handle->conn->session_info->unix_token->gid,
+		handle->conn->session_info->unix_info->sanitized_username,
+		handle->conn->session_info->info->domain_name,
+		buff);
+	if (repository == NULL) {
+		DBG_ERR("talloc_sub_full() failed\n");
+		TALLOC_FREE(config);
+		errno = ENOMEM;
+		return -1;
+	}
+	/* shouldn't we allow absolute path names here? --metze */
+	/* Yes :-). JRA. */
+	trim_char(repository, '\0', '/');
+	config->repository = repository;
+
+	config->keeptree = lp_parm_bool(SNUM(handle->conn),
+					"recycle",
+					"keeptree",
+					False);
+	config->versions = lp_parm_bool(SNUM(handle->conn),
+					"recycle",
+					"versions",
+					False);
+	config->touch = lp_parm_bool(SNUM(handle->conn),
+				     "recycle",
+				     "touch",
+				     False);
+	config->touch_mtime = lp_parm_bool(SNUM(handle->conn),
+					   "recycle",
+					   "touch_mtime",
+					   False);
+	tmplist = lp_parm_string_list(SNUM(handle->conn),
+				      "recycle",
+				      "exclude",
+				      NULL);
+	if (tmplist != NULL) {
+		char **tmpcpy = str_list_copy(config, tmplist);
+		if (tmpcpy == NULL) {
+			DBG_ERR("str_list_copy() failed\n");
+			TALLOC_FREE(config);
+			errno = ENOMEM;
+			return -1;
+		}
+		config->exclude = discard_const_p(const char *, tmpcpy);
+	}
+	tmplist = lp_parm_string_list(SNUM(handle->conn),
+				      "recycle",
+				      "exclude_dir",
+				      NULL);
+	if (tmplist != NULL) {
+		char **tmpcpy = str_list_copy(config, tmplist);
+		if (tmpcpy == NULL) {
+			DBG_ERR("str_list_copy() failed\n");
+			TALLOC_FREE(config);
+			errno = ENOMEM;
+			return -1;
+		}
+		config->exclude_dir = discard_const_p(const char *, tmpcpy);
+	}
+	tmplist = lp_parm_string_list(SNUM(handle->conn),
+				      "recycle",
+				      "noversions",
+				      NULL);
+	if (tmplist != NULL) {
+		char **tmpcpy = str_list_copy(config, tmplist);
+		if (tmpcpy == NULL) {
+			DBG_ERR("str_list_copy() failed\n");
+			TALLOC_FREE(config);
+			errno = ENOMEM;
+			return -1;
+		}
+		config->noversions = discard_const_p(const char *, tmpcpy);
+	}
+	config->minsize = conv_str_size(lp_parm_const_string(
+		SNUM(handle->conn), "recycle", "minsize", NULL));
+	config->maxsize = conv_str_size(lp_parm_const_string(
+		SNUM(handle->conn), "recycle", "maxsize", NULL));
+
+	buff = lp_parm_const_string(SNUM(handle->conn),
+				    "recycle",
+				    "directory_mode",
+				    NULL);
+	if (buff != NULL ) {
+		sscanf(buff, "%o", &t);
+	} else {
+		t = S_IRUSR | S_IWUSR | S_IXUSR;
+	}
+	config->directory_mode = (mode_t)t;
+
+	buff = lp_parm_const_string(SNUM(handle->conn),
+				    "recycle",
+				    "subdir_mode",
+				    NULL);
+	if (buff != NULL ) {
+		sscanf(buff, "%o", &t);
+	} else {
+		t = config->directory_mode;
+	}
+	config->subdir_mode = (mode_t)t;
 
-	DEBUG(10, ("recycle: maxsize = %d\n", maxsize));
-	
-	return maxsize;
+	SMB_VFS_HANDLE_SET_DATA(
+		handle, config, NULL, struct recycle_config_data, return -1);
+	return 0;
 }
 
-static BOOL recycle_directory_exist(vfs_handle_struct *handle, const char *dname)
+static bool recycle_directory_exist(vfs_handle_struct *handle, const char *dname)
 {
-	SMB_STRUCT_STAT st;
+	struct smb_filename smb_fname = {
+			.base_name = discard_const_p(char, dname)
+	};
 
-	if (SMB_VFS_NEXT_STAT(handle, handle->conn, dname, &st) == 0) {
-		if (S_ISDIR(st.st_mode)) {
+	if (SMB_VFS_STAT(handle->conn, &smb_fname) == 0) {
+		if (S_ISDIR(smb_fname.st.st_ex_mode)) {
 			return True;
 		}
 	}
@@ -166,17 +208,25 @@ static BOOL recycle_directory_exist(vfs_handle_struct *handle, const char *dname
 	return False;
 }
 
-static BOOL recycle_file_exist(vfs_handle_struct *handle, const char *fname)
+static bool recycle_file_exist(vfs_handle_struct *handle,
+			       const struct smb_filename *smb_fname)
 {
-	SMB_STRUCT_STAT st;
+	struct smb_filename *smb_fname_tmp = NULL;
+	bool ret = false;
 
-	if (SMB_VFS_NEXT_STAT(handle, handle->conn, fname, &st) == 0) {
-		if (S_ISREG(st.st_mode)) {
-			return True;
+	smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
+	if (smb_fname_tmp == NULL) {
+		return false;
+	}
+
+	if (SMB_VFS_STAT(handle->conn, smb_fname_tmp) == 0) {
+		if (S_ISREG(smb_fname_tmp->st.st_ex_mode)) {
+			ret = true;
 		}
 	}
 
-	return False;
+	TALLOC_FREE(smb_fname_tmp);
+	return ret;
 }
 
 /**
@@ -185,59 +235,111 @@ static BOOL recycle_file_exist(vfs_handle_struct *handle, const char *fname)
  * @param fname file name
  * @return size in bytes
  **/
-static SMB_OFF_T recycle_get_file_size(vfs_handle_struct *handle, const char *fname)
+static off_t recycle_get_file_size(vfs_handle_struct *handle,
+				       const struct smb_filename *smb_fname)
 {
-	SMB_STRUCT_STAT st;
+	struct smb_filename *smb_fname_tmp = NULL;
+	off_t size;
 
-	if (SMB_VFS_NEXT_STAT(handle, handle->conn, fname, &st) != 0) {
-		DEBUG(0,("recycle: stat for %s returned %s\n", fname, strerror(errno)));
-		return (SMB_OFF_T)0;
+	smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
+	if (smb_fname_tmp == NULL) {
+		size = (off_t)0;
+		goto out;
 	}
 
-	return(st.st_size);
+	if (SMB_VFS_STAT(handle->conn, smb_fname_tmp) != 0) {
+		DBG_DEBUG("stat for %s returned %s\n",
+			 smb_fname_str_dbg(smb_fname_tmp), strerror(errno));
+		size = (off_t)0;
+		goto out;
+	}
+
+	size = smb_fname_tmp->st.st_ex_size;
+ out:
+	TALLOC_FREE(smb_fname_tmp);
+	return size;
 }
 
 /**
  * Create directory tree
  * @param conn connection
  * @param dname Directory tree to be created
+ * @param directory mode
+ * @param subdirectory mode
  * @return Returns True for success
  **/
-static BOOL recycle_create_dir(vfs_handle_struct *handle, const char *dname)
+static bool recycle_create_dir(vfs_handle_struct *handle,
+			       const char *dname,
+			       mode_t dir_mode,
+			       mode_t subdir_mode)
 {
-	int len;
-	mode_t mode;
+	size_t len;
+	mode_t mode = dir_mode;
 	char *new_dir = NULL;
 	char *tmp_str = NULL;
 	char *token;
 	char *tok_str;
-	BOOL ret = False;
+	bool ret = False;
+	char *saveptr;
 
-	mode = S_IRUSR | S_IWUSR | S_IXUSR;
-
-	tmp_str = strdup(dname);
+	tmp_str = SMB_STRDUP(dname);
 	ALLOC_CHECK(tmp_str, done);
 	tok_str = tmp_str;
 
-	len = strlen(dname);
-	new_dir = (char *)malloc(len + 1);
+	len = strlen(dname)+1;
+	new_dir = (char *)SMB_MALLOC(len + 1);
 	ALLOC_CHECK(new_dir, done);
 	*new_dir = '\0';
+	if (dname[0] == '/') {
+		/* Absolute path. */
+		if (strlcat(new_dir,"/",len+1) >= len+1) {
+			goto done;
+		}
+	}
 
-	/* Create directory tree if neccessary */
-	for(token = strtok(tok_str, "/"); token; token = strtok(NULL, "/")) {
-		safe_strcat(new_dir, token, len);
+	/* Create directory tree if necessary */
+	for(token = strtok_r(tok_str, "/", &saveptr); token;
+	    token = strtok_r(NULL, "/", &saveptr)) {
+		if (strlcat(new_dir, token, len+1) >= len+1) {
+			goto done;
+		}
 		if (recycle_directory_exist(handle, new_dir))
 			DEBUG(10, ("recycle: dir %s already exists\n", new_dir));
 		else {
+			struct smb_filename *smb_fname = NULL;
+			int retval;
+
 			DEBUG(5, ("recycle: creating new dir %s\n", new_dir));
-			if (SMB_VFS_NEXT_MKDIR(handle, handle->conn, new_dir, mode) != 0) {
-				DEBUG(1,("recycle: mkdir failed for %s with error: %s\n", new_dir, strerror(errno)));
+
+			smb_fname = synthetic_smb_fname(talloc_tos(),
+						new_dir,
+						NULL,
+						NULL,
+						0,
+						0);
+			if (smb_fname == NULL) {
+				goto done;
+			}
+
+			retval = SMB_VFS_NEXT_MKDIRAT(handle,
+					handle->conn->cwd_fsp,
+					smb_fname,
+					mode);
+			if (retval != 0) {
+				DBG_WARNING("recycle: mkdirat failed "
+					"for %s with error: %s\n",
+					new_dir,
+					strerror(errno));
+				TALLOC_FREE(smb_fname);
 				ret = False;
 				goto done;
 			}
+			TALLOC_FREE(smb_fname);
+		}
+		if (strlcat(new_dir, "/", len+1) >= len+1) {
+			goto done;
 		}
-		safe_strcat(new_dir, "/", len);
+		mode = subdir_mode;
 	}
 
 	ret = True;
@@ -248,23 +350,48 @@ done:
 }
 
 /**
- * Check if needle is contained exactly in haystack
- * @param haystack list of parameters separated by delimimiter character
- * @param needle string to be matched exactly to haystack
- * @return True if found
+ * Check if any of the components of "exclude_list" are contained in path.
+ * Return True if found
  **/
-static BOOL checkparam(const char **haystack_list, const char *needle)
+
+static bool matchdirparam(const char **dir_exclude_list, char *path)
 {
-	int i;
+	char *startp = NULL, *endp = NULL;
 
-	if (haystack_list == NULL || haystack_list[0] == NULL ||
-		*haystack_list[0] == '\0' || needle == NULL || *needle == '\0') {
+	if (dir_exclude_list == NULL || dir_exclude_list[0] == NULL ||
+		*dir_exclude_list[0] == '\0' || path == NULL || *path == '\0') {
 		return False;
 	}
 
-	for(i=0; haystack_list[i] ; i++) {
-		if(strequal(haystack_list[i], needle)) {
-			return True;
+	/* 
+	 * Walk the components of path, looking for matches with the
+	 * exclude list on each component. 
+	 */
+
+	for (startp = path; startp; startp = endp) {
+		int i;
+
+		while (*startp == '/') {
+			startp++;
+		}
+		endp = strchr(startp, '/');
+		if (endp) {
+			*endp = '\0';
+		}
+
+		for(i=0; dir_exclude_list[i] ; i++) {
+			if(unix_wild_match(dir_exclude_list[i], startp)) {
+				/* Repair path. */
+				if (endp) {
+					*endp = '/';
+				}
+				return True;
+			}
+		}
+
+		/* Repair path. */
+		if (endp) {
+			*endp = '/';
 		}
 	}
 
@@ -277,7 +404,7 @@ static BOOL checkparam(const char **haystack_list, const char *needle)
  * @param needle string to be matched exectly to haystack including pattern matching
  * @return True if found
  **/
-static BOOL matchparam(const char **haystack_list, const char *needle)
+static bool matchparam(const char **haystack_list, const char *needle)
 {
 	int i;
 
@@ -287,7 +414,7 @@ static BOOL matchparam(const char **haystack_list, const char *needle)
 	}
 
 	for(i=0; haystack_list[i] ; i++) {
-		if(!unix_wild_match(haystack_list[i], needle)) {
+		if(unix_wild_match(haystack_list[i], needle)) {
 			return True;
 		}
 	}
@@ -296,157 +423,264 @@ static BOOL matchparam(const char **haystack_list, const char *needle)
 }
 
 /**
- * Touch access date
+ * Touch access or modify date
  **/
-static void recycle_do_touch(vfs_handle_struct *handle, const char *fname)
+static void recycle_do_touch(vfs_handle_struct *handle,
+			     const struct smb_filename *smb_fname,
+			     bool touch_mtime)
 {
-	SMB_STRUCT_STAT st;
-	struct utimbuf tb;
-	time_t currtime;
-	
-	if (SMB_VFS_NEXT_STAT(handle, handle->conn, fname, &st) != 0) {
-		DEBUG(0,("recycle: stat for %s returned %s\n", fname, strerror(errno)));
+	struct smb_filename *smb_fname_tmp = NULL;
+	struct smb_file_time ft;
+	int ret, err;
+	NTSTATUS status;
+
+	init_smb_file_time(&ft);
+
+	status = synthetic_pathref(talloc_tos(),
+				   handle->conn->cwd_fsp,
+				   smb_fname->base_name,
+				   smb_fname->stream_name,
+				   NULL,
+				   smb_fname->twrp,
+				   smb_fname->flags,
+				   &smb_fname_tmp);
+	if (!NT_STATUS_IS_OK(status)) {
+		DBG_DEBUG("synthetic_pathref for '%s' failed: %s\n",
+			  smb_fname_str_dbg(smb_fname), nt_errstr(status));
 		return;
 	}
-	currtime = time(&currtime);
-	tb.actime = currtime;
-	tb.modtime = st.st_mtime;
 
-	if (SMB_VFS_NEXT_UTIME(handle, handle->conn, fname, &tb) == -1 ) {
-		DEBUG(0, ("recycle: touching %s failed, reason = %s\n", fname, strerror(errno)));
+	/* atime */
+	ft.atime = timespec_current();
+	/* mtime */
+	ft.mtime = touch_mtime ? ft.atime : smb_fname_tmp->st.st_ex_mtime;
+
+	become_root();
+	ret = SMB_VFS_NEXT_FNTIMES(handle, smb_fname_tmp->fsp, &ft);
+	err = errno;
+	unbecome_root();
+	if (ret == -1 ) {
+		DEBUG(0, ("recycle: touching %s failed, reason = %s\n",
+			  smb_fname_str_dbg(smb_fname_tmp), strerror(err)));
 	}
+
+	TALLOC_FREE(smb_fname_tmp);
 }
 
 /**
  * Check if file should be recycled
  **/
-static int recycle_unlink(vfs_handle_struct *handle, connection_struct *conn, const char *file_name)
+static int recycle_unlink_internal(vfs_handle_struct *handle,
+				struct files_struct *dirfsp,
+				const struct smb_filename *smb_fname,
+				int flags)
 {
+	TALLOC_CTX *frame = NULL;
+	struct smb_filename *full_fname = NULL;
 	char *path_name = NULL;
-       	char *temp_name = NULL;
-	char *final_name = NULL;
-	const char *base;
-	char *repository = NULL;
+	const char *temp_name = NULL;
+	const char *final_name = NULL;
+	struct smb_filename *smb_fname_final = NULL;
+	const char *base = NULL;
 	int i = 1;
-	int maxsize;
-	SMB_OFF_T file_size; /* space_avail;	*/
-	BOOL exist;
+	off_t file_size; /* space_avail;	*/
+	bool exist;
 	int rc = -1;
+	struct recycle_config_data *config = NULL;
+	struct vfs_rename_how rhow = { .flags = 0, };
+
+	SMB_VFS_HANDLE_GET_DATA(handle,
+				config,
+				struct recycle_config_data,
+				return -1);
+
+	frame = talloc_stackframe();
+
+	if (config->repository[0] == '\0') {
+		DEBUG(3, ("recycle: repository path not set, purging %s...\n",
+			  smb_fname_str_dbg(smb_fname)));
+		rc = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					smb_fname,
+					flags);
+		goto done;
+	}
 
-	repository = alloc_sub_conn(conn, recycle_repository(handle));
-	ALLOC_CHECK(repository, done);
-	/* shouldn't we allow absolute path names here? --metze */
-	trim_char(repository, '/', '/');
-	
-	if(!repository || *(repository) == '\0') {
-		DEBUG(3, ("recycle: repository path not set, purging %s...\n", file_name));
-		rc = SMB_VFS_NEXT_UNLINK(handle, conn, file_name);
+	full_fname = full_path_from_dirfsp_atname(frame,
+						  dirfsp,
+						  smb_fname);
+	if (full_fname == NULL) {
+		rc = -1;
+		errno = ENOMEM;
 		goto done;
 	}
 
 	/* we don't recycle the recycle bin... */
-	if (strncmp(file_name, repository, strlen(repository)) == 0) {
+	if (strncmp(full_fname->base_name, config->repository,
+		    strlen(config->repository)) == 0) {
 		DEBUG(3, ("recycle: File is within recycling bin, unlinking ...\n"));
-		rc = SMB_VFS_NEXT_UNLINK(handle, conn, file_name);
+		rc = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					smb_fname,
+					flags);
 		goto done;
 	}
 
-	file_size = recycle_get_file_size(handle, file_name);
+	file_size = recycle_get_file_size(handle, full_fname);
 	/* it is wrong to purge filenames only because they are empty imho
 	 *   --- simo
 	 *
 	if(fsize == 0) {
 		DEBUG(3, ("recycle: File %s is empty, purging...\n", file_name));
-		rc = SMB_VFS_NEXT_UNLINK(handle,conn,file_name);
+		rc = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					file_name,
+					flags);
 		goto done;
 	}
 	 */
 
-	/* FIXME: this is wrong, we should check the hole size of the recycle bin is
+	/* FIXME: this is wrong, we should check the whole size of the recycle bin is
 	 * not greater then maxsize, not the size of the single file, also it is better
 	 * to remove older files
 	 */
-	maxsize = recycle_maxsize(handle);
-	if(maxsize > 0 && file_size > maxsize) {
-		DEBUG(3, ("recycle: File %s exceeds maximum recycle size, purging... \n", file_name));
-		rc = SMB_VFS_NEXT_UNLINK(handle, conn, file_name);
+	if (config->maxsize > 0 && file_size > config->maxsize) {
+		DBG_NOTICE("File %s exceeds maximum recycle size, "
+			   "purging... \n",
+			   smb_fname_str_dbg(full_fname));
+		rc = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					smb_fname,
+					flags);
+		goto done;
+	}
+	if (config->minsize > 0 && file_size < config->minsize) {
+		DBG_NOTICE("File %s lowers minimum recycle size, "
+			   "purging... \n",
+			   smb_fname_str_dbg(full_fname));
+		rc = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					smb_fname,
+					flags);
 		goto done;
 	}
 
 	/* FIXME: this is wrong: moving files with rename does not change the disk space
 	 * allocation
 	 *
-	space_avail = SMB_VFS_NEXT_DISK_FREE(handle, conn, ".", True, &bsize, &dfree, &dsize) * 1024L;
+	space_avail = SMB_VFS_NEXT_DISK_FREE(handle, ".", True, &bsize, &dfree, &dsize) * 1024L;
 	DEBUG(5, ("space_avail = %Lu, file_size = %Lu\n", space_avail, file_size));
 	if(space_avail < file_size) {
 		DEBUG(3, ("recycle: Not enough diskspace, purging file %s\n", file_name));
-		rc = SMB_VFS_NEXT_UNLINK(handle, conn, file_name);
+		rc = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					file_name,
+					flags);
 		goto done;
 	}
 	 */
 
 	/* extract filename and path */
-	base = strrchr(file_name, '/');
-	if (base == NULL) {
-		base = file_name;
-		path_name = strdup("/");
-		ALLOC_CHECK(path_name, done);
-	}
-	else {
-		path_name = strdup(file_name);
-		ALLOC_CHECK(path_name, done);
-		path_name[base - file_name] = '\0';
-		base++;
+	if (!parent_dirname(frame, full_fname->base_name, &path_name, &base)) {
+		rc = -1;
+		errno = ENOMEM;
+		goto done;
 	}
 
-	DEBUG(10, ("recycle: fname = %s\n", file_name));	/* original filename with path */
-	DEBUG(10, ("recycle: fpath = %s\n", path_name));	/* original path */
-	DEBUG(10, ("recycle: base = %s\n", base));		/* filename without path */
+	/* original filename with path */
+	DEBUG(10, ("recycle: fname = %s\n", smb_fname_str_dbg(full_fname)));
+	/* original path */
+	DEBUG(10, ("recycle: fpath = %s\n", path_name));
+	/* filename without path */
+	DEBUG(10, ("recycle: base = %s\n", base));
 
-	if (matchparam(recycle_exclude(handle), base)) {
+	if (matchparam(config->exclude, base)) {
 		DEBUG(3, ("recycle: file %s is excluded \n", base));
-		rc = SMB_VFS_NEXT_UNLINK(handle, conn, file_name);
+		rc = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					smb_fname,
+					flags);
 		goto done;
 	}
 
-	/* FIXME: this check will fail if we have more than one level of directories,
-	 * we shoud check for every level 1, 1/2, 1/2/3, 1/2/3/4 .... 
-	 * 	---simo
-	 */
-	if (checkparam(recycle_exclude_dir(handle), path_name)) {
+	if (matchdirparam(config->exclude_dir, path_name)) {
 		DEBUG(3, ("recycle: directory %s is excluded \n", path_name));
-		rc = SMB_VFS_NEXT_UNLINK(handle, conn, file_name);
+		rc = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					smb_fname,
+					flags);
 		goto done;
 	}
 
-	if (recycle_keep_dir_tree(handle) == True) {
-		asprintf(&temp_name, "%s/%s", repository, path_name);
+	if (config->keeptree) {
+		temp_name = talloc_asprintf(frame, "%s/%s",
+					    config->repository,
+					    path_name);
+		if (temp_name == NULL) {
+			rc = -1;
+			goto done;
+		}
 	} else {
-		temp_name = strdup(repository);
+		temp_name = config->repository;
 	}
-	ALLOC_CHECK(temp_name, done);
 
 	exist = recycle_directory_exist(handle, temp_name);
 	if (exist) {
 		DEBUG(10, ("recycle: Directory already exists\n"));
 	} else {
 		DEBUG(10, ("recycle: Creating directory %s\n", temp_name));
-		if (recycle_create_dir(handle, temp_name) == False) {
-			DEBUG(3, ("recycle: Could not create directory, purging %s...\n", file_name));
-			rc = SMB_VFS_NEXT_UNLINK(handle, conn, file_name);
+		if (recycle_create_dir(handle,
+				       temp_name,
+				       config->directory_mode,
+				       config->subdir_mode) == False)
+		{
+			DEBUG(3, ("recycle: Could not create directory, "
+				  "purging %s...\n",
+				  smb_fname_str_dbg(full_fname)));
+			rc = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					smb_fname,
+					flags);
 			goto done;
 		}
 	}
 
-	asprintf(&final_name, "%s/%s", temp_name, base);
-	ALLOC_CHECK(final_name, done);
-	DEBUG(10, ("recycle: recycled file name: %s\n", final_name));		/* new filename with path */
+	final_name = talloc_asprintf(frame, "%s/%s",
+				     temp_name, base);
+	if (final_name == NULL) {
+		rc = -1;
+		goto done;
+	}
+
+	/* Create smb_fname with final base name and orig stream name. */
+	smb_fname_final = synthetic_smb_fname(frame,
+					final_name,
+					full_fname->stream_name,
+					NULL,
+					full_fname->twrp,
+					full_fname->flags);
+	if (smb_fname_final == NULL) {
+		rc = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					smb_fname,
+					flags);
+		goto done;
+	}
+
+	/* new filename with path */
+	DEBUG(10, ("recycle: recycled file name: %s\n",
+		   smb_fname_str_dbg(smb_fname_final)));
 
 	/* check if we should delete file from recycle bin */
-	if (recycle_file_exist(handle, final_name)) {
-		if (recycle_versions(handle) == False || matchparam(recycle_noversions(handle), base) == True) {
-			DEBUG(3, ("recycle: Removing old file %s from recycle bin\n", final_name));
-			if (SMB_VFS_NEXT_UNLINK(handle, conn, final_name) != 0) {
+	if (recycle_file_exist(handle, smb_fname_final)) {
+		if (config->versions == False ||
+		    matchparam(config->noversions, base) == True) {
+			DEBUG(3, ("recycle: Removing old file %s from recycle "
+				  "bin\n", smb_fname_str_dbg(smb_fname_final)));
+			if (SMB_VFS_NEXT_UNLINKAT(handle,
+						dirfsp->conn->cwd_fsp,
+						smb_fname_final,
+						flags) != 0) {
 				DEBUG(1, ("recycle: Error deleting old file: %s\n", strerror(errno)));
 			}
 		}
@@ -454,38 +688,83 @@ static int recycle_unlink(vfs_handle_struct *handle, connection_struct *conn, co
 
 	/* rename file we move to recycle bin */
 	i = 1;
-	while (recycle_file_exist(handle, final_name)) {
-		SAFE_FREE(final_name);
-		asprintf(&final_name, "%s/Copy #%d of %s", temp_name, i++, base);
+	while (recycle_file_exist(handle, smb_fname_final)) {
+		char *copy = NULL;
+
+		TALLOC_FREE(smb_fname_final->base_name);
+		copy = talloc_asprintf(smb_fname_final, "%s/Copy #%d of %s",
+				       temp_name, i++, base);
+		if (copy == NULL) {
+			rc = -1;
+			goto done;
+		}
+		smb_fname_final->base_name = copy;
 	}
 
-	DEBUG(10, ("recycle: Moving %s to %s\n", file_name, final_name));
-	rc = SMB_VFS_NEXT_RENAME(handle, conn, file_name, final_name);
+	DEBUG(10, ("recycle: Moving %s to %s\n", smb_fname_str_dbg(full_fname),
+		smb_fname_str_dbg(smb_fname_final)));
+	rc = SMB_VFS_NEXT_RENAMEAT(handle,
+			dirfsp,
+			smb_fname,
+			handle->conn->cwd_fsp,
+			smb_fname_final,
+			&rhow);
 	if (rc != 0) {
-		DEBUG(3, ("recycle: Move error %d (%s), purging file %s (%s)\n", errno, strerror(errno), file_name, final_name));
-		rc = SMB_VFS_NEXT_UNLINK(handle, conn, file_name);
+		DEBUG(3, ("recycle: Move error %d (%s), purging file %s "
+			  "(%s)\n", errno, strerror(errno),
+			  smb_fname_str_dbg(full_fname),
+			  smb_fname_str_dbg(smb_fname_final)));
+		rc = SMB_VFS_NEXT_UNLINKAT(handle,
+				dirfsp,
+				smb_fname,
+				flags);
 		goto done;
 	}
 
 	/* touch access date of moved file */
-	if (recycle_touch(handle) == True )
-		recycle_do_touch(handle, final_name);
+	if (config->touch || config->touch_mtime)
+		recycle_do_touch(handle, smb_fname_final, config->touch_mtime);
 
 done:
-	SAFE_FREE(path_name);
-	SAFE_FREE(temp_name);
-	SAFE_FREE(final_name);
-	SAFE_FREE(repository);
+	TALLOC_FREE(frame);
 	return rc;
 }
 
-NTSTATUS vfs_recycle_init(void)
+static int recycle_unlinkat(vfs_handle_struct *handle,
+		struct files_struct *dirfsp,
+		const struct smb_filename *smb_fname,
+		int flags)
 {
-	NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "recycle", recycle_ops);
+	int ret;
+
+	if (flags & AT_REMOVEDIR) {
+		ret = SMB_VFS_NEXT_UNLINKAT(handle,
+					dirfsp,
+					smb_fname,
+					flags);
+	} else {
+		ret = recycle_unlink_internal(handle,
+					dirfsp,
+					smb_fname,
+					flags);
+	}
+	return ret;
+}
+
+static struct vfs_fn_pointers vfs_recycle_fns = {
+	.connect_fn = vfs_recycle_connect,
+	.unlinkat_fn = recycle_unlinkat,
+};
+
+static_decl_vfs;
+NTSTATUS vfs_recycle_init(TALLOC_CTX *ctx)
+{
+	NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "recycle",
+					&vfs_recycle_fns);
 
 	if (!NT_STATUS_IS_OK(ret))
 		return ret;
-	
+
 	vfs_recycle_debug_level = debug_add_class("recycle");
 	if (vfs_recycle_debug_level == -1) {
 		vfs_recycle_debug_level = DBGC_VFS;
@@ -493,6 +772,6 @@ NTSTATUS vfs_recycle_init(void)
 	} else {
 		DEBUG(10, ("vfs_recycle: Debug class number of 'recycle': %d\n", vfs_recycle_debug_level));
 	}
-	
+
 	return ret;
 }