]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Remove redundant attrib_clear in upload_dir_internal.
authordtucker@openbsd.org <dtucker@openbsd.org>
Fri, 3 Sep 2021 05:12:25 +0000 (05:12 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Fri, 3 Sep 2021 07:32:31 +0000 (17:32 +1000)
The subsequent call to stat_to_attrib clears the struct as its first step
anyway. From pmeinhardt via github PR#220, ok djm@

OpenBSD-Commit-ID: f5234fc6d7425b607e179acb3383f21716f3029e

sftp-client.c

index 5bfff90d187fa0bd56f6973efadb0c89ff538837..9de9afa20f68c82bb0db35b9185da49871b07dec 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.154 2021/08/09 23:47:44 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.155 2021/09/03 05:12:25 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -2039,7 +2039,6 @@ upload_dir_internal(struct sftp_conn *conn, const char *src, const char *dst,
        if (print_flag && print_flag != SFTP_PROGRESS_ONLY)
                mprintf("Entering %s\n", src);
 
-       attrib_clear(&a);
        stat_to_attrib(&sb, &a);
        a.flags &= ~SSH2_FILEXFER_ATTR_SIZE;
        a.flags &= ~SSH2_FILEXFER_ATTR_UIDGID;