3 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 891db12a6..c64a40468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,10 @@
      Use clock_gettime(CLOCK_MONOTONIC ...) for ssh timers so that things like
      keepalives and rekeying will work properly over clock steps.  Suggested by
      markus@, "looks good" djm@.
+   - dtucker@cvs.openbsd.org 2013/06/01 20:59:25
+     [scp.c sftp-client.c]
+     Replace S_IWRITE, which isn't standardized, with S_IWUSR, which is.  Patch
+     from Nathan Osman via bz#2085.  ok deraadt.
 
 20130529
   - (dtucker) [configure.ac openbsd-compat/bsd-misc.h] bz#2087: Add a null
diff --git a/scp.c b/scp.c
index 32e9d00b2..b75d97bb9 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.173 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.174 2013/06/01 20:59:25 dtucker Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -1066,7 +1066,7 @@ sink(int argc, char **argv)
                         continue;
                 }
                 omode = mode;
-                mode |= S_IWRITE;
+                mode |= S_IWUSR;
                 if ((ofd = open(np, O_WRONLY|O_CREAT, mode)) < 0) {
 bad:                    run_err("%s: %s", np, strerror(errno));
                         continue;
diff --git a/sftp-client.c b/sftp-client.c
index 038e1c347..fc60dd80d 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.98 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.99 2013/06/01 20:59:25 dtucker Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1051,7 +1051,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
         }
 
         local_fd = open(local_path, O_WRONLY | O_CREAT | O_TRUNC,
-            mode | S_IWRITE);
+            mode | S_IWUSR);
         if (local_fd == -1) {
                 error("Couldn't open local file \"%s\" for writing: %s",
                     local_path, strerror(errno));