diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2018-06-01 06:31:48 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-06-04 06:54:43 +0200 |
| commit | e5019da3c5a31e6e729a565f2b886a80c4be96cc (patch) | |
| tree | 8cceacd3e5ed700f92824c1d9b6b538a7b6fdaea | |
| parent | upstream: Adapt to extra default verboisity from ssh-keygen when (diff) | |
| download | openssh-e5019da3c5a31e6e729a565f2b886a80c4be96cc.tar.xz openssh-e5019da3c5a31e6e729a565f2b886a80c4be96cc.zip | |
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
| -rw-r--r-- | scp.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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"); |