s3: smbd: Convert _srvsvc_NetSetFileSecurity() to use filename_convert_dirfsp().

One less use of filename_convert().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index aac6affbc563f8d4463f0be3e80d729f176020b9..c5b39ed9cb6211b842301d2453d52c1b5ca2674a 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -2630,6 +2630,7 @@ WERROR _srvsvc_NetSetFileSecurity(struct pipes_struct *p,
                loadparm_s3_global_substitution();
        struct smb_filename *smb_fname = NULL;
        char *servicename = NULL;
+       struct files_struct *dirfsp = NULL;
        files_struct *fsp = NULL;
        SMB_STRUCT_STAT st;
        NTSTATUS nt_status;
@@ -2640,6 +2641,7 @@ WERROR _srvsvc_NetSetFileSecurity(struct pipes_struct *p,
        struct security_descriptor *psd = NULL;
        uint32_t security_info_sent = 0;
        uint32_t ucf_flags = 0;
+       NTTIME twrp = 0;
 
        ZERO_STRUCT(st);
 
@@ -2673,12 +2675,13 @@ WERROR _srvsvc_NetSetFileSecurity(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;
@@ -2687,7 +2690,7 @@ WERROR _srvsvc_NetSetFileSecurity(struct pipes_struct *p,
        nt_status = SMB_VFS_CREATE_FILE(
                conn,                                   /* conn */
                NULL,                                   /* req */
-               NULL,                                   /* dirfsp */
+               dirfsp,                                 /* dirfsp */
                smb_fname,                              /* fname */
                FILE_WRITE_ATTRIBUTES,                  /* access_mask */
                FILE_SHARE_READ|FILE_SHARE_WRITE,       /* share_access */