]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Convert _srvsvc_NetGetFileSecurity() to use filename_convert_dirfsp().
authorJeremy Allison <jra@samba.org>
Thu, 28 Jul 2022 17:46:25 +0000 (10:46 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 2 Aug 2022 19:49:32 +0000 (19:49 +0000)
One less use of filename_convert().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
source3/rpc_server/srvsvc/srv_srvsvc_nt.c

index b6f2b34b8e84b47edeb6e4aa976383485535f0ad..aac6affbc563f8d4463f0be3e80d729f176020b9 100644 (file)
@@ -2498,9 +2498,11 @@ WERROR _srvsvc_NetGetFileSecurity(struct pipes_struct *p,
        struct conn_struct_tos *c = NULL;
        connection_struct *conn = NULL;
        struct sec_desc_buf *sd_buf = NULL;
+       struct files_struct *dirfsp = NULL;
        files_struct *fsp = NULL;
        int snum;
        uint32_t ucf_flags = 0;
+       NTTIME twrp = 0;
 
        ZERO_STRUCT(st);
 
@@ -2532,12 +2534,13 @@ WERROR _srvsvc_NetGetFileSecurity(struct pipes_struct *p,
        }
        conn = c->conn;
 
-       nt_status = filename_convert(frame,
-                                       conn,
-                                       r->in.file,
-                                       ucf_flags,
-                                       0,
-                                       &smb_fname);
+       nt_status = filename_convert_dirfsp(frame,
+                                           conn,
+                                           r->in.file,
+                                           ucf_flags,
+                                           twrp,
+                                           &dirfsp,
+                                           &smb_fname);
        if (!NT_STATUS_IS_OK(nt_status)) {
                werr = ntstatus_to_werror(nt_status);
                goto error_exit;
@@ -2546,7 +2549,7 @@ WERROR _srvsvc_NetGetFileSecurity(struct pipes_struct *p,
        nt_status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                NULL,                                   /* req */
-               NULL,                                   /* dirfsp */
+               dirfsp,                                 /* dirfsp */
                smb_fname,                              /* fname */
                FILE_READ_ATTRIBUTES,                   /* access_mask */
                FILE_SHARE_READ|FILE_SHARE_WRITE,       /* share_access */