;
}
-static int skel_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode)
+static int skel_mkdir(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
errno = ENOSYS;
return -1;
SMB_VFS_NEXT_REWINDDIR(handle, dirp);
}
-static int skel_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode)
+static int skel_mkdir(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
- return SMB_VFS_NEXT_MKDIR(handle, path, mode);
+ return SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
}
static int skel_rmdir(vfs_handle_struct *handle, const char *path)
/* Bump to version 35 - Samba 4.5 will ship with that */
/* Version 35 - Change get_nt_acl_fn from const char *, to
const struct smb_filename * */
+/* Version 35 - Change mkdir from const char *, to
+ const struct smb_filename * */
#define SMB_VFS_INTERFACE_VERSION 35
void (*seekdir_fn)(struct vfs_handle_struct *handle, DIR *dirp, long offset);
long (*telldir_fn)(struct vfs_handle_struct *handle, DIR *dirp);
void (*rewind_dir_fn)(struct vfs_handle_struct *handle, DIR *dirp);
- int (*mkdir_fn)(struct vfs_handle_struct *handle, const char *path, mode_t mode);
+ int (*mkdir_fn)(struct vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode);
int (*rmdir_fn)(struct vfs_handle_struct *handle, const char *path);
int (*closedir_fn)(struct vfs_handle_struct *handle, DIR *dir);
void (*init_search_op_fn)(struct vfs_handle_struct *handle, DIR *dirp);
DIR *dirp);
void smb_vfs_call_rewind_dir(struct vfs_handle_struct *handle,
DIR *dirp);
-int smb_vfs_call_mkdir(struct vfs_handle_struct *handle, const char *path,
- mode_t mode);
+int smb_vfs_call_mkdir(struct vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode);
int smb_vfs_call_rmdir(struct vfs_handle_struct *handle, const char *path);
int smb_vfs_call_closedir(struct vfs_handle_struct *handle,
DIR *dir);
#define SMB_VFS_NEXT_REWINDDIR(handle, dirp) \
smb_vfs_call_rewind_dir((handle)->next, (dirp))
-#define SMB_VFS_MKDIR(conn, path, mode) \
- smb_vfs_call_mkdir((conn)->vfs_handles,(path), (mode))
-#define SMB_VFS_NEXT_MKDIR(handle, path, mode) \
- smb_vfs_call_mkdir((handle)->next,(path), (mode))
+#define SMB_VFS_MKDIR(conn, smb_fname, mode) \
+ smb_vfs_call_mkdir((conn)->vfs_handles,(smb_fname), (mode))
+#define SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode) \
+ smb_vfs_call_mkdir((handle)->next,(smb_fname), (mode))
#define SMB_VFS_RMDIR(conn, path) \
smb_vfs_call_rmdir((conn)->vfs_handles, (path))
return result;
}
-static int audit_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode)
+static int audit_mkdir(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
int result;
- result = SMB_VFS_NEXT_MKDIR(handle, path, mode);
+ result = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
syslog(audit_syslog_priority(handle), "mkdir %s %s%s\n",
- path,
+ smb_fname->base_name,
(result < 0) ? "failed: " : "",
(result < 0) ? strerror(errno) : "");
return newdirent;
}
-static int cap_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode)
+static int cap_mkdir(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
- char *cappath = capencode(talloc_tos(), path);
+ char *cappath = capencode(talloc_tos(), smb_fname->base_name);
+ struct smb_filename *cap_smb_fname = NULL;
if (!cappath) {
errno = ENOMEM;
return -1;
}
- return SMB_VFS_NEXT_MKDIR(handle, cappath, mode);
+
+ cap_smb_fname = synthetic_smb_fname(talloc_tos(),
+ cappath,
+ NULL,
+ NULL);
+ if (cap_smb_fname == NULL) {
+ TALLOC_FREE(cappath);
+ errno = ENOMEM;
+ return -1;
+ }
+
+ return SMB_VFS_NEXT_MKDIR(handle, cap_smb_fname, mode);
}
static int cap_rmdir(vfs_handle_struct *handle, const char *path)
}
static int catia_mkdir(vfs_handle_struct *handle,
- const char *path,
+ const struct smb_filename *smb_fname,
mode_t mode)
{
char *name = NULL;
NTSTATUS status;
int ret;
+ struct smb_filename *catia_smb_fname = NULL;
- status = catia_string_replace_allocate(handle->conn, path,
- &name, vfs_translate_to_unix);
+ status = catia_string_replace_allocate(handle->conn,
+ smb_fname->base_name,
+ &name,
+ vfs_translate_to_unix);
if (!NT_STATUS_IS_OK(status)) {
errno = map_errno_from_nt_status(status);
return -1;
}
+ catia_smb_fname = synthetic_smb_fname(talloc_tos(),
+ name,
+ NULL,
+ NULL);
+ if (catia_smb_fname == NULL) {
+ TALLOC_FREE(name);
+ errno = ENOMEM;
+ return -1;
+ }
- ret = SMB_VFS_NEXT_MKDIR(handle, name, mode);
+ ret = SMB_VFS_NEXT_MKDIR(handle, catia_smb_fname, mode);
TALLOC_FREE(name);
+ TALLOC_FREE(catia_smb_fname);
return ret;
}
END_PROFILE(syscall_rewinddir);
}
-static int vfswrap_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode)
+static int vfswrap_mkdir(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
int result;
bool has_dacl = False;
+ const char *path = smb_fname->base_name;
char *parent = NULL;
START_PROFILE(syscall_mkdir);
return result;
}
-static int audit_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode)
+static int audit_mkdir(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
int result;
- result = SMB_VFS_NEXT_MKDIR(handle, path, mode);
+ result = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
if (lp_syslog() > 0) {
syslog(audit_syslog_priority(handle), "mkdir %s %s%s\n",
- path,
+ smb_fname->base_name,
(result < 0) ? "failed: " : "",
(result < 0) ? strerror(errno) : "");
}
DEBUG(0, ("vfs_extd_audit: mkdir %s %s %s\n",
- path,
+ smb_fname->base_name,
(result < 0) ? "failed: " : "",
(result < 0) ? strerror(errno) : ""));
}
static int smb_full_audit_mkdir(vfs_handle_struct *handle,
- const char *path, mode_t mode)
+ const struct smb_filename *smb_fname, mode_t mode)
{
int result;
- result = SMB_VFS_NEXT_MKDIR(handle, path, mode);
+ result = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
- do_log(SMB_VFS_OP_MKDIR, (result >= 0), handle, "%s", path);
+ do_log(SMB_VFS_OP_MKDIR, (result >= 0), handle, "%s",
+ smb_fname->base_name);
return result;
}
#include "system/filesys.h"
#include "smbd/smbd.h"
-static int linux_xfs_sgid_mkdir(vfs_handle_struct *handle, const char *path, mode_t mode)
+static int linux_xfs_sgid_mkdir(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
struct smb_filename fname = { 0, };
int mkdir_res;
int res;
- DEBUG(10, ("Calling linux_xfs_sgid_mkdir(%s)\n", path));
+ DEBUG(10, ("Calling linux_xfs_sgid_mkdir(%s)\n", smb_fname->base_name));
- mkdir_res = SMB_VFS_NEXT_MKDIR(handle, path, mode);
+ mkdir_res = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
if (mkdir_res == -1) {
DEBUG(10, ("SMB_VFS_NEXT_MKDIR returned error: %s\n",
strerror(errno)));
return mkdir_res;
}
- if (!parent_dirname(talloc_tos(), path, &fname.base_name, NULL)) {
+ if (!parent_dirname(talloc_tos(),
+ smb_fname->base_name,
+ &fname.base_name,
+ NULL)) {
DEBUG(1, ("parent_dirname failed\n"));
/* return success, we did the mkdir */
return mkdir_res;
return mkdir_res;
}
- fname.base_name = discard_const_p(char, path);
+ fname.base_name = discard_const_p(char, smb_fname->base_name);
res = SMB_VFS_NEXT_STAT(handle, &fname);
if (res == -1) {
- DEBUG(2, ("Could not stat just created dir %s: %s\n", path,
- strerror(errno)));
+ DEBUG(2, ("Could not stat just created dir %s: %s\n",
+ smb_fname->base_name,
+ strerror(errno)));
/* return success, we did the mkdir */
return mkdir_res;
}
* return success. What can you do...
*/
become_root();
- res = SMB_VFS_NEXT_CHMOD(handle, path, fname.st.st_ex_mode);
+ res = SMB_VFS_NEXT_CHMOD(handle,
+ smb_fname->base_name,
+ fname.st.st_ex_mode);
unbecome_root();
if (res == -1) {
- DEBUG(2, ("CHMOD(%s, %o) failed: %s\n", path,
+ DEBUG(2, ("CHMOD(%s, %o) failed: %s\n", smb_fname->base_name,
(int)fname.st.st_ex_mode, strerror(errno)));
/* return success, we did the mkdir */
return mkdir_res;
* Failure: set errno, return -1
*/
static int mh_mkdir(vfs_handle_struct *handle,
- const char *path,
+ const struct smb_filename *smb_fname,
mode_t mode)
{
int status;
- char *clientPath;
- TALLOC_CTX *ctx;
-
+ struct smb_filename *clientFname = NULL;
+ const char *path = smb_fname->base_name;
DEBUG(MH_INFO_DEBUG, ("Entering with path '%s'\n", path));
if (!is_in_media_files(path))
{
- status = SMB_VFS_NEXT_MKDIR(handle, path, mode);
+ status = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
goto out;
}
- clientPath = NULL;
- ctx = talloc_tos();
-
- if ((status = alloc_get_client_path(handle, ctx,
- path,
- &clientPath)))
- {
+ status = alloc_get_client_smb_fname(handle,
+ talloc_tos(),
+ smb_fname,
+ &clientFname);
+ if (status != 0) {
goto err;
}
- status = SMB_VFS_NEXT_MKDIR(handle, clientPath, mode);
+ status = SMB_VFS_NEXT_MKDIR(handle, clientFname, mode);
err:
- TALLOC_FREE(clientPath);
+ TALLOC_FREE(clientFname);
out:
DEBUG(MH_INFO_DEBUG, ("Leaving with path '%s'\n", path));
return status;
if (recycle_directory_exist(handle, new_dir))
DEBUG(10, ("recycle: dir %s already exists\n", new_dir));
else {
+ struct smb_filename *smb_fname = NULL;
+
DEBUG(5, ("recycle: creating new dir %s\n", new_dir));
- if (SMB_VFS_NEXT_MKDIR(handle, new_dir, mode) != 0) {
+
+ smb_fname = synthetic_smb_fname(talloc_tos(),
+ new_dir,
+ NULL,
+ NULL);
+ if (smb_fname == NULL) {
+ goto done;
+ }
+
+ if (SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode) != 0) {
DEBUG(1,("recycle: mkdir 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;
}
static int shadow_copy2_mkdir(vfs_handle_struct *handle,
- const char *fname, mode_t mode)
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
time_t timestamp;
char *stripped;
int ret, saved_errno;
char *conv;
+ struct smb_filename *conv_smb_fname = NULL;
- if (!shadow_copy2_strip_snapshot(talloc_tos(), handle, fname,
- ×tamp, &stripped)) {
+ if (!shadow_copy2_strip_snapshot(talloc_tos(),
+ handle,
+ smb_fname->base_name,
+ ×tamp,
+ &stripped)) {
return -1;
}
if (timestamp == 0) {
- return SMB_VFS_NEXT_MKDIR(handle, fname, mode);
+ return SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
}
conv = shadow_copy2_convert(talloc_tos(), handle, stripped, timestamp);
TALLOC_FREE(stripped);
if (conv == NULL) {
return -1;
}
- ret = SMB_VFS_NEXT_MKDIR(handle, conv, mode);
+ conv_smb_fname = synthetic_smb_fname(talloc_tos(),
+ conv,
+ NULL,
+ NULL);
+ if (conv_smb_fname == NULL) {
+ TALLOC_FREE(conv);
+ return -1;
+ }
+ ret = SMB_VFS_NEXT_MKDIR(handle, conv_smb_fname, mode);
saved_errno = errno;
TALLOC_FREE(conv);
+ TALLOC_FREE(conv_smb_fname);
errno = saved_errno;
return ret;
}
}
static int snapper_gmt_mkdir(vfs_handle_struct *handle,
- const char *fname, mode_t mode)
+ const struct smb_filename *fname,
+ mode_t mode)
{
time_t timestamp;
char *stripped;
int ret, saved_errno;
char *conv;
+ struct smb_filename *smb_fname = NULL;
- if (!snapper_gmt_strip_snapshot(talloc_tos(), handle, fname,
+ if (!snapper_gmt_strip_snapshot(talloc_tos(), handle, fname->base_name,
×tamp, &stripped)) {
return -1;
}
if (conv == NULL) {
return -1;
}
- ret = SMB_VFS_NEXT_MKDIR(handle, conv, mode);
- saved_errno = errno;
+ smb_fname = synthetic_smb_fname(talloc_tos(),
+ conv,
+ NULL,
+ NULL);
TALLOC_FREE(conv);
+ if (smb_fname == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
+
+ ret = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
+ saved_errno = errno;
+ TALLOC_FREE(smb_fname);
errno = saved_errno;
return ret;
}
uint8_t id_buf[16];
bool check_valid;
const char *rootdir;
+ struct smb_filename *rootdir_fname = NULL;
+ struct smb_filename *tmp_fname = NULL;
check_valid = lp_parm_bool(SNUM(handle->conn),
"streams_depot", "check_valid", true);
SNUM(handle->conn), "streams_depot", "directory",
tmp);
+ rootdir_fname = synthetic_smb_fname(talloc_tos(),
+ rootdir,
+ NULL,
+ NULL);
+ if (rootdir_fname == NULL) {
+ errno = ENOMEM;
+ goto fail;
+ }
+
/* Stat the base file if it hasn't already been done. */
if (base_sbuf == NULL) {
struct smb_filename *smb_fname_base;
goto fail;
}
- if ((SMB_VFS_NEXT_MKDIR(handle, rootdir, 0755) != 0)
+ if ((SMB_VFS_NEXT_MKDIR(handle, rootdir_fname, 0755) != 0)
&& (errno != EEXIST)) {
goto fail;
}
goto fail;
}
- if ((SMB_VFS_NEXT_MKDIR(handle, tmp, 0755) != 0)
+ tmp_fname = synthetic_smb_fname(talloc_tos(), tmp, NULL, NULL);
+ if (tmp_fname == NULL) {
+ errno = ENOMEM;
+ goto fail;
+ }
+
+ if ((SMB_VFS_NEXT_MKDIR(handle, tmp_fname, 0755) != 0)
&& (errno != EEXIST)) {
goto fail;
}
TALLOC_FREE(tmp);
+ TALLOC_FREE(tmp_fname);
tmp = talloc_asprintf(result, "%s/%2.2X/%2.2X", rootdir, first,
second);
goto fail;
}
- if ((SMB_VFS_NEXT_MKDIR(handle, tmp, 0755) != 0)
+ tmp_fname = synthetic_smb_fname(talloc_tos(), tmp, NULL, NULL);
+ if (tmp_fname == NULL) {
+ errno = ENOMEM;
+ goto fail;
+ }
+
+ if ((SMB_VFS_NEXT_MKDIR(handle, tmp_fname, 0755) != 0)
&& (errno != EEXIST)) {
goto fail;
}
TALLOC_FREE(tmp);
+ TALLOC_FREE(tmp_fname);
- if ((SMB_VFS_NEXT_MKDIR(handle, result, 0755) != 0)
+ /* smb_fname_hash is the struct smb_filename version of 'result' */
+ if ((SMB_VFS_NEXT_MKDIR(handle, smb_fname_hash, 0755) != 0)
&& (errno != EEXIST)) {
goto fail;
}
goto fail;
}
+ TALLOC_FREE(rootdir_fname);
+ TALLOC_FREE(tmp_fname);
TALLOC_FREE(smb_fname_hash);
return result;
fail:
+ TALLOC_FREE(rootdir_fname);
+ TALLOC_FREE(tmp_fname);
TALLOC_FREE(smb_fname_hash);
TALLOC_FREE(result);
return NULL;
SYNCOPS_NEXT(MKNOD, fname, (handle, fname, mode, dev));
}
-static int syncops_mkdir(vfs_handle_struct *handle, const char *fname, mode_t mode)
+static int syncops_mkdir(vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
- SYNCOPS_NEXT(MKDIR, fname, (handle, fname, mode));
+ SYNCOPS_NEXT_SMB_FNAME(MKDIR, smb_fname, (handle, smb_fname, mode));
}
static int syncops_rmdir(vfs_handle_struct *handle, const char *fname)
}
static int smb_time_audit_mkdir(vfs_handle_struct *handle,
- const char *path, mode_t mode)
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
int result;
struct timespec ts1,ts2;
double timediff;
clock_gettime_mono(&ts1);
- result = SMB_VFS_NEXT_MKDIR(handle, path, mode);
+ result = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
clock_gettime_mono(&ts2);
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
if (timediff > audit_timeout) {
- smb_time_audit_log_fname("mkdir", timediff, path);
+ smb_time_audit_log_smb_fname("mkdir",
+ timediff,
+ smb_fname);
}
return result;
}
static int um_mkdir(vfs_handle_struct *handle,
- const char *path,
+ const struct smb_filename *smb_fname,
mode_t mode)
{
int status;
- char *clientPath;
- TALLOC_CTX *ctx;
-
+ const char *path = smb_fname->base_name;
+ struct smb_filename *client_fname = NULL;
DEBUG(10, ("Entering with path '%s'\n", path));
if (!is_in_media_files(path) || !is_in_media_dir(path)) {
- return SMB_VFS_NEXT_MKDIR(handle, path, mode);
+ return SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
}
- clientPath = NULL;
- ctx = talloc_tos();
-
- if ((status = alloc_get_client_path(handle, ctx,
- path,
- &clientPath))) {
+ status = alloc_get_client_smb_fname(handle,
+ talloc_tos(),
+ smb_fname,
+ &client_fname);
+ if (status != 0) {
goto err;
}
- status = SMB_VFS_NEXT_MKDIR(handle, clientPath, mode);
+ status = SMB_VFS_NEXT_MKDIR(handle, client_fname, mode);
err:
- TALLOC_FREE(clientPath);
+ TALLOC_FREE(client_fname);
DEBUG(10, ("Leaving with path '%s'\n", path));
return status;
}
return status;
}
- if (SMB_VFS_MKDIR(conn, smb_dname->base_name, mode) != 0) {
+ if (SMB_VFS_MKDIR(conn, smb_dname, mode) != 0) {
return map_nt_error_from_unix(errno);
}
handle->fns->rewind_dir_fn(handle, dirp);
}
-int smb_vfs_call_mkdir(struct vfs_handle_struct *handle, const char *path,
- mode_t mode)
+int smb_vfs_call_mkdir(struct vfs_handle_struct *handle,
+ const struct smb_filename *smb_fname,
+ mode_t mode)
{
VFS_FIND(mkdir);
- return handle->fns->mkdir_fn(handle, path, mode);
+ return handle->fns->mkdir_fn(handle, smb_fname, mode);
}
int smb_vfs_call_rmdir(struct vfs_handle_struct *handle, const char *path)
static NTSTATUS cmd_mkdir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
{
+ struct smb_filename *smb_fname = NULL;
+
if (argc != 2) {
printf("Usage: mkdir <path>\n");
return NT_STATUS_OK;
}
- if (SMB_VFS_MKDIR(vfs->conn, argv[1], 00755) == -1) {
+ smb_fname = synthetic_smb_fname(talloc_tos(),
+ argv[1],
+ NULL,
+ NULL);
+
+ if (smb_fname == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ if (SMB_VFS_MKDIR(vfs->conn, smb_fname, 00755) == -1) {
printf("mkdir error=%d (%s)\n", errno, strerror(errno));
return NT_STATUS_UNSUCCESSFUL;
}