upstream: Apply umask to all incoming files and directories not

just files. This makes sure it gets applied to directories too, and prevents
a race where files get chmodded after creation.  bz#2839, ok djm@

OpenBSD-Commit-ID: 3168ee6c7c39093adac4fd71039600cfa296203b

1 files changed, 3 insertions, 1 deletions

diff --git a/scp.c b/scp.c
index 80aed84b6..60682c687 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.196 2018/04/10 00:10:49 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -1092,6 +1092,8 @@ sink(int argc, char **argv)
                                 SCREWUP("bad mode");
                         mode = (mode << 3) | (*cp - '0');
                 }
+                if (!pflag)
+                        mode &= ~mask;
                 if (*cp++ != ' ')
                         SCREWUP("mode not delimited");