]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
shadow_copy2: Use dirfsp if it's around
authorVolker Lendecke <vl@samba.org>
Thu, 15 Sep 2022 13:11:55 +0000 (06:11 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 17 Sep 2022 04:15:35 +0000 (04:15 +0000)
Not used yet, and the "if" around dirfsp!=NULL will go away in a later
patch.

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

index a2e27f3a9383bbaabb6f8b69c6094241d5f299ed..85dec164d50b58d85b4f3fef6e0a51cbc38d34fb 100644 (file)
@@ -2634,7 +2634,7 @@ static const char *shadow_copy2_connectpath(
        char *stripped = NULL;
        char *tmp = NULL;
        const char *fname = smb_fname_in->base_name;
-       struct smb_filename *full = NULL;
+       const struct smb_filename *full = smb_fname_in;
        struct smb_filename smb_fname = {0};
        struct smb_filename *result_fname = NULL;
        char *result = NULL;
@@ -2654,10 +2654,12 @@ static const char *shadow_copy2_connectpath(
                return priv->shadow_connectpath;
        }
 
-       full = full_path_from_dirfsp_atname(
-               talloc_tos(), dirfsp, smb_fname_in);
-       if (full == NULL) {
-               return NULL;
+       if (dirfsp != NULL) {
+               full = full_path_from_dirfsp_atname(
+                       talloc_tos(), dirfsp, smb_fname_in);
+               if (full == NULL) {
+                       return NULL;
+               }
        }
 
        if (!shadow_copy2_strip_snapshot(talloc_tos(), handle, full,