s3: Remove the now unused fname parameter from filename_convert()

diff --git a/source3/include/proto.h b/source3/include/proto.h
index fe81bd2c97b652b4bed9e16ce7c732d19effeadd..77283d9cf0a172af6aa38e61607920f938f6d608 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6320,8 +6320,7 @@ NTSTATUS filename_convert(TALLOC_CTX *mem_ctx,
                        connection_struct *conn,
                        bool dfs_path,
                        const char *name_in,
-                       struct smb_filename **pp_smb_fname,
-                       char **pp_name);
+                       struct smb_filename **pp_smb_fname);
 
 /* The following definitions come from smbd/filename_utils.c */
 

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index c58c08ecdc7216e1582f683b4ffcbf800b41ad39..b9d1ed6d73e2dee8b196176ea0312f3fc076690f 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -2072,8 +2072,7 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p,
                                        conn,
                                        false,
                                        r->in.file,
-                                       &smb_fname,
-                                       NULL);
+                                       &smb_fname);
        if (!NT_STATUS_IS_OK(nt_status)) {
                werr = ntstatus_to_werror(nt_status);
                goto error_exit;
@@ -2201,8 +2200,7 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p,
                                        conn,
                                        false,
                                        r->in.file,
-                                       &smb_fname,
-                                       NULL);
+                                       &smb_fname);
        if (!NT_STATUS_IS_OK(nt_status)) {
                werr = ntstatus_to_werror(nt_status);
                goto error_exit;

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index c05f0e659fb003ecfd6f99d20f18395d743d2d50..541b0cd3cbe31a9fc0540a87b49c7ae153305c34 100644 (file)
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1018,8 +1018,7 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx,
                                connection_struct *conn,
                                bool dfs_path,
                                const char *name_in,
-                               struct smb_filename **pp_smb_fname,
-                               char **pp_name)
+                               struct smb_filename **pp_smb_fname)
 {
        NTSTATUS status;
        char *fname = NULL;
@@ -1046,22 +1045,15 @@ NTSTATUS filename_convert(TALLOC_CTX *ctx,
                return status;
        }
 
-       status = get_full_smb_filename(ctx, *pp_smb_fname, &fname);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-
-       status = check_name(conn, fname);
+       status = check_name(conn, (*pp_smb_fname)->base_name);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(3,("filename_convert: check_name failed "
                        "for name %s with %s\n",
-                       fname,
+                       smb_fname_str_dbg(*pp_smb_fname),
                        nt_errstr(status) ));
+               TALLOC_FREE(*pp_smb_fname);
                return status;
        }
 
-       if (pp_name != NULL) {
-               *pp_name = fname;
-       }
        return status;
 }

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index af79986df457dd10e6148504e7c4b70a8fc50f4c..43212dc800f94a0ed78fd104ecbcf2fa13323c55 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -478,8 +478,7 @@ void reply_ntcreate_and_X(struct smb_request *req)
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               &smb_fname,
-                               NULL);
+                               &smb_fname);
 
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
@@ -968,8 +967,7 @@ static void call_nt_transact_create(connection_struct *conn,
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               &smb_fname,
-                               NULL);
+                               &smb_fname);
 
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
@@ -1355,8 +1353,7 @@ void reply_ntrename(struct smb_request *req)
                status = filename_convert(ctx, conn,
                                          req->flags2 & FLAGS2_DFS_PATHNAMES,
                                          oldname,
-                                         &smb_fname_old,
-                                         NULL);
+                                         &smb_fname_old);
                if (!NT_STATUS_IS_OK(status)) {
                        if (NT_STATUS_EQUAL(status,
                                            NT_STATUS_PATH_NOT_COVERED)) {
@@ -1372,8 +1369,7 @@ void reply_ntrename(struct smb_request *req)
                status = filename_convert(ctx, conn,
                                          req->flags2 & FLAGS2_DFS_PATHNAMES,
                                          newname,
-                                         &smb_fname_new,
-                                         NULL);
+                                         &smb_fname_new);
                if (!NT_STATUS_IS_OK(status)) {
                        if (NT_STATUS_EQUAL(status,
                                            NT_STATUS_PATH_NOT_COVERED)) {

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 5924c46cc1f633fc60407280714a71e768b5f7bf..72595aeda7ef16475852da7406f19a33b7b27937 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -994,8 +994,7 @@ void reply_checkpath(struct smb_request *req)
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                name,
-                               &smb_fname,
-                               NULL);
+                               &smb_fname);
 
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
@@ -1091,8 +1090,7 @@ void reply_getatr(struct smb_request *req)
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               &smb_fname,
-                               NULL);
+                               &smb_fname);
                if (!NT_STATUS_IS_OK(status)) {
                        if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                                reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
@@ -1193,8 +1191,7 @@ void reply_setatr(struct smb_request *req)
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               &smb_fname,
-                               NULL);
+                               &smb_fname);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                        reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
@@ -1747,8 +1744,7 @@ void reply_open(struct smb_request *req)
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               &smb_fname,
-                               NULL);
+                               &smb_fname);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                        reply_botherror(req,
@@ -1918,8 +1914,7 @@ void reply_open_and_X(struct smb_request *req)
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               &smb_fname,
-                               NULL);
+                               &smb_fname);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                        reply_botherror(req,
@@ -2128,8 +2123,7 @@ void reply_mknew(struct smb_request *req)
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               &smb_fname,
-                               NULL);
+                               &smb_fname);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                        reply_botherror(req,
@@ -2261,8 +2255,7 @@ void reply_ctemp(struct smb_request *req)
        status = filename_convert(ctx, conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               &smb_fname,
-                               NULL);
+                               &smb_fname);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                        reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
@@ -5267,8 +5260,7 @@ void reply_mkdir(struct smb_request *req)
        status = filename_convert(ctx, conn,
                                 req->flags2 & FLAGS2_DFS_PATHNAMES,
                                 directory,
-                                &smb_dname,
-                                NULL);
+                                &smb_dname);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                        reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
@@ -5575,8 +5567,7 @@ void reply_rmdir(struct smb_request *req)
        status = filename_convert(ctx, conn,
                                 req->flags2 & FLAGS2_DFS_PATHNAMES,
                                 directory,
-                                &smb_dname,
-                                NULL);
+                                &smb_dname);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                        reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 7337a345fd6a8ce807daef2a17eabeed4abc22f0..b455f82d80c1835406c09ea5cf97b5c82a422bc8 100644 (file)
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -325,8 +325,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                        smbreq->conn,
                                        smbreq->flags2 & FLAGS2_DFS_PATHNAMES,
                                        in_name,
-                                       &smb_fname,
-                                       NULL);
+                                       &smb_fname);
                if (!NT_STATUS_IS_OK(status)) {
                        tevent_req_nterror(req, status);
                        TALLOC_FREE(smb_fname);

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 2f1f50b11ddd8d41b04f83ea3cd0ab4bd3b0b0ab..8637d1bda1ec5b9087a75c2b6818bbc55d1d40b5 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1028,8 +1028,7 @@ static void call_trans2open(connection_struct *conn,
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               &smb_fname,
-                               NULL);
+                               &smb_fname);
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                        reply_botherror(req,
@@ -4889,8 +4888,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
                                        conn,
                                        req->flags2 & FLAGS2_DFS_PATHNAMES,
                                        fname,
-                                       &smb_fname,
-                                       NULL);
+                                       &smb_fname);
                if (!NT_STATUS_IS_OK(status)) {
                        if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                                reply_botherror(req,
@@ -5664,8 +5662,7 @@ static NTSTATUS smb_set_file_unix_hlink(connection_struct *conn,
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                oldname,
-                               &smb_fname_old,
-                               NULL);
+                               &smb_fname_old);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -7465,8 +7462,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn,
                status = filename_convert(req, conn,
                                         req->flags2 & FLAGS2_DFS_PATHNAMES,
                                         fname,
-                                        &smb_fname,
-                                        NULL);
+                                        &smb_fname);
                if (!NT_STATUS_IS_OK(status)) {
                        if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
                                reply_botherror(req,
@@ -7587,8 +7583,7 @@ static void call_trans2mkdir(connection_struct *conn, struct smb_request *req,
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                directory,
-                               &smb_dname,
-                               NULL);
+                               &smb_dname);
 
        if (!NT_STATUS_IS_OK(status)) {
                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {