shadow_copy2: Remove an intermediate if-statement
authorVolker Lendecke <vl@samba.org>
Thu, 15 Sep 2022 15:55:01 +0000 (08:55 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 17 Sep 2022 05:15:04 +0000 (05:15 +0000)
Now we always pass in a dirfsp from our only caller

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Sep 17 05:15:04 UTC 2022 on sn-devel-184

source3/modules/vfs_shadow_copy2.c

index 85dec164d50b58d85b4f3fef6e0a51cbc38d34fb..43f02488f84411d77537807d417dba4dbe5e7a25 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;
-       const struct smb_filename *full = smb_fname_in;
+       const struct smb_filename *full = NULL;
        struct smb_filename smb_fname = {0};
        struct smb_filename *result_fname = NULL;
        char *result = NULL;
@@ -2654,12 +2654,10 @@ static const char *shadow_copy2_connectpath(
                return priv->shadow_connectpath;
        }
 
-       if (dirfsp != NULL) {
-               full = full_path_from_dirfsp_atname(
-                       talloc_tos(), dirfsp, smb_fname_in);
-               if (full == NULL) {
-                       return 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,