===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/scp.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- src/usr.bin/ssh/scp.c	2018/04/10 00:10:49	1.196
+++ src/usr.bin/ssh/scp.c	2018/06/01 04:31:48	1.197
@@ -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).
@@ -1069,6 +1069,8 @@
 				SCREWUP("bad mode");
 			mode = (mode << 3) | (*cp - '0');
 		}
+		if (!pflag)
+			mode &= ~mask;
 		if (*cp++ != ' ')
 			SCREWUP("mode not delimited");