[openssh-commits] [openssh] 03/03: upstream: fiddle with mask after umask call and not before; avoids

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 1c553a16065a95284468cd79b1c4919929dfe3ac
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Wed Apr 29 22:22:10 2026 +0000

    upstream: fiddle with mask after umask call and not before; avoids
    
    fortify warnings on android. bz3954
    
    OpenBSD-Commit-ID: 82224426b2ee989c68f305caa50aa3d3b4993a84
---
 scp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scp.c b/scp.c
index 1faa9a555..621db83c0 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.273 2026/04/02 07:42:16 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.274 2026/04/29 22:22:10 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -1679,8 +1679,8 @@ sink(int argc, char **argv, const char *src)
 	setimes = targisdir = 0;
 	mask = umask(0);
 	if (!pflag) {
-		mask |= 07000;
 		(void) umask(mask);
+		mask |= 07000;
 	}
 	if (argc != 1) {
 		run_err("ambiguous target");

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.