s3:lib: Remove the const SMB_STRUCT_STAT * parameter from synthetic_smb_fname_split().

Only one caller uses this, and this can be handled externally.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 7066e4e53ee9ba397dd73d927e0fbe23c0dc3e7c..224db9ad13269aadd6e3a80d660c9bd163a775d6 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1141,8 +1141,7 @@ struct smb_filename *synthetic_smb_fname(TALLOC_CTX *mem_ctx,
                                         const char *stream_name,
                                         const SMB_STRUCT_STAT *psbuf);
 struct smb_filename *synthetic_smb_fname_split(TALLOC_CTX *ctx,
-                                              const char *fname,
-                                              const SMB_STRUCT_STAT *psbuf);
+                                              const char *fname);
 const char *smb_fname_str_dbg(const struct smb_filename *smb_fname);
 const char *fsp_str_dbg(const struct files_struct *fsp);
 const char *fsp_fnum_dbg(const struct files_struct *fsp);

diff --git a/source3/lib/filename_util.c b/source3/lib/filename_util.c
index bdb24c5c6feae41dac8b44d1ac909961523413db..025a943ecf31cc3fc4f47ec131a905709c94162b 100644 (file)
--- a/source3/lib/filename_util.c
+++ b/source3/lib/filename_util.c
@@ -73,8 +73,7 @@ struct smb_filename *synthetic_smb_fname(TALLOC_CTX *mem_ctx,
  * There are a few legitimate users of this.
  */
 struct smb_filename *synthetic_smb_fname_split(TALLOC_CTX *ctx,
-                                              const char *fname,
-                                              const SMB_STRUCT_STAT *psbuf)
+                                              const char *fname)
 {
        char *stream_name = NULL;
        char *base_name = NULL;
@@ -83,7 +82,7 @@ struct smb_filename *synthetic_smb_fname_split(TALLOC_CTX *ctx,
 
        if (lp_posix_pathnames()) {
                /* No stream name looked for. */
-               return synthetic_smb_fname(ctx, fname, NULL, psbuf);
+               return synthetic_smb_fname(ctx, fname, NULL, NULL);
        }
 
        ok = split_stream_filename(ctx,
@@ -94,7 +93,7 @@ struct smb_filename *synthetic_smb_fname_split(TALLOC_CTX *ctx,
                return NULL;
        }
 
-       ret = synthetic_smb_fname(ctx, base_name, stream_name, psbuf);
+       ret = synthetic_smb_fname(ctx, base_name, stream_name, NULL);
        TALLOC_FREE(base_name);
        TALLOC_FREE(stream_name);
        return ret;

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 14eb53f31463cc4b1fc393271bf347edf7a2b578..fc56b245fbf55f6eca651ea3af18042a3bac62b0 100644 (file)
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1423,11 +1423,11 @@ static NTSTATUS filename_convert_internal(TALLOC_CTX *ctx,
                ZERO_STRUCT(st);
                st.st_ex_nlink = 1;
                *pp_smb_fname = synthetic_smb_fname_split(ctx,
-                                                         name_in,
-                                                         &st);
+                                                         name_in);
                if (*pp_smb_fname == NULL) {
                        return NT_STATUS_NO_MEMORY;
                }
+               (*pp_smb_fname)->st = st;
                return NT_STATUS_OK;
        }
 

diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c
index 68bc3e758490d8a3e35efe78f87136fbf99e0afc..41f0e3f0aa08e19a4dc99bc3df1a86a926ff9181 100644 (file)
--- a/source3/smbd/pysmbd.c
+++ b/source3/smbd/pysmbd.c
@@ -124,7 +124,7 @@ static NTSTATUS set_nt_acl_conn(const char *fname,
           so set our umask to 0 */
        saved_umask = umask(0);
 
-       smb_fname = synthetic_smb_fname_split(fsp, fname, NULL);
+       smb_fname = synthetic_smb_fname_split(fsp, fname);
        if (smb_fname == NULL) {
                TALLOC_FREE(frame);
                umask(saved_umask);
@@ -446,7 +446,7 @@ static PyObject *py_smbd_unlink(PyObject *self, PyObject *args, PyObject *kwargs
                return NULL;
        }
 
-       smb_fname = synthetic_smb_fname_split(frame, fname, NULL);
+       smb_fname = synthetic_smb_fname_split(frame, fname);
        if (smb_fname == NULL) {
                TALLOC_FREE(frame);
                return PyErr_NoMemory();

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index bb91d77b416830909c77303e6e6b792373c852be..673b735568e3b019c7fe061d278b4f4d06275615 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -6645,7 +6645,7 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
                 * component of the destination.
                 */
                smb_fname_orig_lcomp = synthetic_smb_fname_split(
-                       ctx, smb_fname_dst->original_lcomp, NULL);
+                       ctx, smb_fname_dst->original_lcomp);
                if (smb_fname_orig_lcomp == NULL) {
                        status = NT_STATUS_NO_MEMORY;
                        TALLOC_FREE(fname_dst_lcomp_base_mod);

diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 4bd5417fb8ae00d25d02df7bd86003315729319b..a06947c1dc41de83758164597df978c508b2f089 100644 (file)
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -354,7 +354,7 @@ static NTSTATUS cmd_open(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
        }
        fsp->conn = vfs->conn;
 
-       smb_fname = synthetic_smb_fname_split(NULL, argv[1], NULL);
+       smb_fname = synthetic_smb_fname_split(NULL, argv[1]);
        if (smb_fname == NULL) {
                TALLOC_FREE(fsp);
                return NT_STATUS_NO_MEMORY;
@@ -584,12 +584,12 @@ static NTSTATUS cmd_rename(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
                return NT_STATUS_OK;
        }
 
-       smb_fname_src = synthetic_smb_fname_split(mem_ctx, argv[1], NULL);
+       smb_fname_src = synthetic_smb_fname_split(mem_ctx, argv[1]);
        if (smb_fname_src == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       smb_fname_dst = synthetic_smb_fname_split(mem_ctx, argv[2], NULL);
+       smb_fname_dst = synthetic_smb_fname_split(mem_ctx, argv[2]);
        if (smb_fname_dst == NULL) {
                TALLOC_FREE(smb_fname_src);
                return NT_STATUS_NO_MEMORY;
@@ -644,7 +644,7 @@ static NTSTATUS cmd_stat(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
                return NT_STATUS_OK;
        }
 
-       smb_fname = synthetic_smb_fname_split(mem_ctx, argv[1], NULL);
+       smb_fname = synthetic_smb_fname_split(mem_ctx, argv[1]);
        if (smb_fname == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -783,7 +783,7 @@ static NTSTATUS cmd_lstat(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
                return NT_STATUS_OK;
        }
 
-       smb_fname = synthetic_smb_fname_split(mem_ctx, argv[1], NULL);
+       smb_fname = synthetic_smb_fname_split(mem_ctx, argv[1]);
        if (smb_fname == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1043,7 +1043,7 @@ static NTSTATUS cmd_utime(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
        ft.atime = convert_time_t_to_timespec(atoi(argv[2]));
        ft.mtime = convert_time_t_to_timespec(atoi(argv[3]));
 
-       smb_fname = synthetic_smb_fname_split(mem_ctx, argv[1], NULL);
+       smb_fname = synthetic_smb_fname_split(mem_ctx, argv[1]);
        if (smb_fname == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -1530,7 +1530,7 @@ static NTSTATUS cmd_set_nt_acl(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int a
        }
        fsp->conn = vfs->conn;
 
-       smb_fname = synthetic_smb_fname_split(NULL, argv[1], NULL);
+       smb_fname = synthetic_smb_fname_split(NULL, argv[1]);
        if (smb_fname == NULL) {
                TALLOC_FREE(fsp);
                return NT_STATUS_NO_MEMORY;