*/
#include "includes.h"
+#include "smbd/smbd.h"
+#include "system/filesys.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "auth.h"
#define ALLOC_CHECK(ptr, label) do { if ((ptr) == NULL) { DEBUG(0, ("recycle.bin: out of memory!\n")); errno = ENOMEM; goto label; } } while(0)
#undef DBGC_CLASS
#define DBGC_CLASS vfs_recycle_debug_level
-static int recycle_connect(vfs_handle_struct *handle, const char *service, const char *user);
-static void recycle_disconnect(vfs_handle_struct *handle);
-static int recycle_unlink(vfs_handle_struct *handle, 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}
-};
-
-static int recycle_connect(vfs_handle_struct *handle, 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, service, user);
-}
-
-static void recycle_disconnect(vfs_handle_struct *handle)
-{
- DEBUG(10,("recycle_disconnect() connect to service[%s].\n",
- lp_servicename(SNUM(handle->conn))));
-
- SMB_VFS_NEXT_DISCONNECT(handle);
-}
+static int recycle_unlink(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname);
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;
}
ret = lp_parm_bool(SNUM(handle->conn), "recycle", "versions", False);
DEBUG(10, ("recycle: versions = %s\n", ret?"True":"False"));
-
+
return ret;
}
ret = lp_parm_bool(SNUM(handle->conn), "recycle", "touch", False);
DEBUG(10, ("recycle: touch = %s\n", ret?"True":"False"));
-
+
return ret;
}
ret = lp_parm_bool(SNUM(handle->conn), "recycle", "touch_mtime", False);
DEBUG(10, ("recycle: touch_mtime = %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)
{
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;
}
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);
DEBUG(10, ("recycle: noversions = %s\n", tmp_lp?*tmp_lp:""));
-
+
return tmp_lp;
}
static SMB_OFF_T recycle_maxsize(vfs_handle_struct *handle)
{
SMB_OFF_T maxsize;
-
+
maxsize = conv_str_size(lp_parm_const_string(SNUM(handle->conn),
"recycle", "maxsize", NULL));
DEBUG(10, ("recycle: maxsize = %lu\n", (long unsigned int)maxsize));
-
+
return maxsize;
}
static SMB_OFF_T recycle_minsize(vfs_handle_struct *handle)
{
SMB_OFF_T minsize;
-
+
minsize = conv_str_size(lp_parm_const_string(SNUM(handle->conn),
"recycle", "minsize", NULL));
DEBUG(10, ("recycle: minsize = %lu\n", (long unsigned int)minsize));
-
+
return minsize;
}
{
SMB_STRUCT_STAT st;
- if (SMB_VFS_NEXT_STAT(handle, dname, &st) == 0) {
- if (S_ISDIR(st.st_mode)) {
+ if (vfs_stat_smb_fname(handle->conn, dname, &st) == 0) {
+ if (S_ISDIR(st.st_ex_mode)) {
return True;
}
}
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;
+ NTSTATUS status;
+ bool ret = false;
- if (SMB_VFS_NEXT_STAT(handle, fname, &st) == 0) {
- if (S_ISREG(st.st_mode)) {
- return True;
+ status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp);
+ if (!NT_STATUS_IS_OK(status)) {
+ 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;
}
/**
* @param fname file name
* @return size in bytes
**/
-static SMB_OFF_T recycle_get_file_size(vfs_handle_struct *handle, const char *fname)
+static SMB_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;
+ NTSTATUS status;
+ SMB_OFF_T size;
+
+ status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp);
+ if (!NT_STATUS_IS_OK(status)) {
+ size = (SMB_OFF_T)0;
+ goto out;
+ }
- if (SMB_VFS_NEXT_STAT(handle, fname, &st) != 0) {
- DEBUG(0,("recycle: stat for %s returned %s\n", fname, strerror(errno)));
- return (SMB_OFF_T)0;
+ if (SMB_VFS_STAT(handle->conn, smb_fname_tmp) != 0) {
+ DEBUG(0,("recycle: stat for %s returned %s\n",
+ smb_fname_str_dbg(smb_fname_tmp), strerror(errno)));
+ size = (SMB_OFF_T)0;
+ goto out;
}
- return(st.st_size);
+ size = smb_fname_tmp->st.st_ex_size;
+ out:
+ TALLOC_FREE(smb_fname_tmp);
+ return size;
}
/**
*new_dir = '\0';
if (dname[0] == '/') {
/* Absolute path. */
- safe_strcat(new_dir,"/",len);
+ if (strlcat(new_dir,"/",len+1) >= len+1) {
+ goto done;
+ }
}
/* Create directory tree if neccessary */
for(token = strtok_r(tok_str, "/", &saveptr); token;
token = strtok_r(NULL, "/", &saveptr)) {
- safe_strcat(new_dir, token, len);
+ 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 {
goto done;
}
}
- safe_strcat(new_dir, "/", len);
+ if (strlcat(new_dir, "/", len+1) >= len+1) {
+ goto done;
+ }
mode = recycle_subdir_mode(handle);
}
/**
* 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 timespec ts[2];
+ struct smb_filename *smb_fname_tmp = NULL;
+ struct smb_file_time ft;
+ NTSTATUS status;
int ret, err;
- if (SMB_VFS_NEXT_STAT(handle, fname, &st) != 0) {
- DEBUG(0,("recycle: stat for %s returned %s\n",
- fname, strerror(errno)));
+ ZERO_STRUCT(ft);
+
+ status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp);
+ if (!NT_STATUS_IS_OK(status)) {
return;
}
- ts[0] = timespec_current(); /* atime */
- ts[1] = touch_mtime ? ts[0] : get_mtimespec(&st); /* mtime */
+
+ if (SMB_VFS_STAT(handle->conn, smb_fname_tmp) != 0) {
+ DEBUG(0,("recycle: stat for %s returned %s\n",
+ smb_fname_str_dbg(smb_fname_tmp), strerror(errno)));
+ goto out;
+ }
+ /* 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_NTIMES(handle, fname, ts);
+ ret = SMB_VFS_NEXT_NTIMES(handle, smb_fname_tmp, &ft);
err = errno;
unbecome_root();
if (ret == -1 ) {
DEBUG(0, ("recycle: touching %s failed, reason = %s\n",
- fname, strerror(err)));
+ smb_fname_str_dbg(smb_fname_tmp), strerror(err)));
}
+ out:
+ TALLOC_FREE(smb_fname_tmp);
}
/**
* Check if file should be recycled
**/
-static int recycle_unlink(vfs_handle_struct *handle, const char *file_name)
+static int recycle_unlink(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname)
{
connection_struct *conn = handle->conn;
char *path_name = NULL;
char *temp_name = NULL;
char *final_name = NULL;
+ struct smb_filename *smb_fname_final = NULL;
const char *base;
char *repository = NULL;
int i = 1;
SMB_OFF_T maxsize, minsize;
SMB_OFF_T file_size; /* space_avail; */
bool exist;
+ NTSTATUS status;
int rc = -1;
repository = talloc_sub_advanced(NULL, lp_servicename(SNUM(conn)),
- conn->server_info->unix_name,
+ conn->session_info->unix_info->unix_name,
conn->connectpath,
- conn->server_info->gid,
- conn->server_info->sanitized_username,
- pdb_get_domain(conn->server_info->sam_account),
+ conn->session_info->unix_token->gid,
+ conn->session_info->unix_info->sanitized_username,
+ conn->session_info->info->domain_name,
recycle_repository(handle));
ALLOC_CHECK(repository, done);
/* shouldn't we allow absolute path names here? --metze */
/* Yes :-). JRA. */
trim_char(repository, '\0', '/');
-
+
if(!repository || *(repository) == '\0') {
- DEBUG(3, ("recycle: repository path not set, purging %s...\n", file_name));
- rc = SMB_VFS_NEXT_UNLINK(handle, file_name);
+ DEBUG(3, ("recycle: repository path not set, purging %s...\n",
+ smb_fname_str_dbg(smb_fname)));
+ rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
goto done;
}
/* we don't recycle the recycle bin... */
- if (strncmp(file_name, repository, strlen(repository)) == 0) {
+ if (strncmp(smb_fname->base_name, repository,
+ strlen(repository)) == 0) {
DEBUG(3, ("recycle: File is within recycling bin, unlinking ...\n"));
- rc = SMB_VFS_NEXT_UNLINK(handle, file_name);
+ rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
goto done;
}
- file_size = recycle_get_file_size(handle, file_name);
+ file_size = recycle_get_file_size(handle, smb_fname);
/* it is wrong to purge filenames only because they are empty imho
* --- simo
*
*/
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, file_name);
+ DEBUG(3, ("recycle: File %s exceeds maximum recycle size, "
+ "purging... \n", smb_fname_str_dbg(smb_fname)));
+ rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
goto done;
}
minsize = recycle_minsize(handle);
if(minsize > 0 && file_size < minsize) {
- DEBUG(3, ("recycle: File %s lowers minimum recycle size, purging... \n", file_name));
- rc = SMB_VFS_NEXT_UNLINK(handle, file_name);
+ DEBUG(3, ("recycle: File %s lowers minimum recycle size, "
+ "purging... \n", smb_fname_str_dbg(smb_fname)));
+ rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
goto done;
}
*/
/* extract filename and path */
- base = strrchr(file_name, '/');
+ base = strrchr(smb_fname->base_name, '/');
if (base == NULL) {
- base = file_name;
+ base = smb_fname->base_name;
path_name = SMB_STRDUP("/");
ALLOC_CHECK(path_name, done);
}
else {
- path_name = SMB_STRDUP(file_name);
+ path_name = SMB_STRDUP(smb_fname->base_name);
ALLOC_CHECK(path_name, done);
- path_name[base - file_name] = '\0';
+ path_name[base - smb_fname->base_name] = '\0';
base++;
}
- 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(smb_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)) {
DEBUG(3, ("recycle: file %s is excluded \n", base));
- rc = SMB_VFS_NEXT_UNLINK(handle, file_name);
+ rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
goto done;
}
if (matchdirparam(recycle_exclude_dir(handle), path_name)) {
DEBUG(3, ("recycle: directory %s is excluded \n", path_name));
- rc = SMB_VFS_NEXT_UNLINK(handle, file_name);
+ rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
goto done;
}
if (recycle_keep_dir_tree(handle) == True) {
- asprintf(&temp_name, "%s/%s", repository, path_name);
+ if (asprintf(&temp_name, "%s/%s", repository, path_name) == -1) {
+ ALLOC_CHECK(temp_name, done);
+ }
} else {
temp_name = SMB_STRDUP(repository);
}
} 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, file_name);
+ DEBUG(3, ("recycle: Could not create directory, "
+ "purging %s...\n",
+ smb_fname_str_dbg(smb_fname)));
+ rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
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 */
+ if (asprintf(&final_name, "%s/%s", temp_name, base) == -1) {
+ ALLOC_CHECK(final_name, done);
+ }
+
+ /* Create smb_fname with final base name and orig stream name. */
+ status = create_synthetic_smb_fname(talloc_tos(), final_name,
+ smb_fname->stream_name, NULL,
+ &smb_fname_final);
+ if (!NT_STATUS_IS_OK(status)) {
+ rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
+ 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_file_exist(handle, smb_fname_final)) {
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, final_name) != 0) {
+ DEBUG(3, ("recycle: Removing old file %s from recycle "
+ "bin\n", smb_fname_str_dbg(smb_fname_final)));
+ if (SMB_VFS_NEXT_UNLINK(handle,
+ smb_fname_final) != 0) {
DEBUG(1, ("recycle: Error deleting old file: %s\n", strerror(errno)));
}
}
/* rename file we move to recycle bin */
i = 1;
- while (recycle_file_exist(handle, final_name)) {
+ while (recycle_file_exist(handle, smb_fname_final)) {
SAFE_FREE(final_name);
- asprintf(&final_name, "%s/Copy #%d of %s", temp_name, i++, base);
+ if (asprintf(&final_name, "%s/Copy #%d of %s", temp_name, i++, base) == -1) {
+ ALLOC_CHECK(final_name, done);
+ }
+ TALLOC_FREE(smb_fname_final->base_name);
+ smb_fname_final->base_name = talloc_strdup(smb_fname_final,
+ final_name);
+ if (smb_fname_final->base_name == NULL) {
+ rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
+ goto done;
+ }
}
- DEBUG(10, ("recycle: Moving %s to %s\n", file_name, final_name));
- rc = SMB_VFS_NEXT_RENAME(handle, file_name, final_name);
+ DEBUG(10, ("recycle: Moving %s to %s\n", smb_fname_str_dbg(smb_fname),
+ smb_fname_str_dbg(smb_fname_final)));
+ rc = SMB_VFS_NEXT_RENAME(handle, smb_fname, smb_fname_final);
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, file_name);
+ DEBUG(3, ("recycle: Move error %d (%s), purging file %s "
+ "(%s)\n", errno, strerror(errno),
+ smb_fname_str_dbg(smb_fname),
+ smb_fname_str_dbg(smb_fname_final)));
+ rc = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
goto done;
}
/* touch access date of moved file */
if (recycle_touch(handle) == True || recycle_touch_mtime(handle))
- recycle_do_touch(handle, final_name, recycle_touch_mtime(handle));
+ recycle_do_touch(handle, smb_fname_final,
+ recycle_touch_mtime(handle));
done:
SAFE_FREE(path_name);
SAFE_FREE(temp_name);
SAFE_FREE(final_name);
+ TALLOC_FREE(smb_fname_final);
TALLOC_FREE(repository);
return rc;
}
+static struct vfs_fn_pointers vfs_recycle_fns = {
+ .unlink_fn = recycle_unlink
+};
+
NTSTATUS vfs_recycle_init(void);
NTSTATUS vfs_recycle_init(void)
{
- NTSTATUS ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "recycle", recycle_ops);
+ 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;
} else {
DEBUG(10, ("vfs_recycle: Debug class number of 'recycle': %d\n", vfs_recycle_debug_level));
}
-
+
return ret;
}
git.samba.org / amitay / samba.git / blobdiff