* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect

setting the modes by `ignore-errors'.  It might fail, for example
if the file is not owned by the user but the group.
(tramp-handle-write-region): Ensure, that `tmpfile' is always readable.

2 files changed, 13 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c33598f6e24..541c723de2b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-22  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Protect
+        setting the modes by `ignore-errors'.  It might fail, for example
+        if the file is not owned by the user but the group.
+        (tramp-handle-write-region): Ensure, that `tmpfile' is always readable.
+
 2010-02-21  Chong Yidong  <cyd@stupidchicken.com>
 
         * files.el (directory-listing-before-filename-regexp): Use
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index eed5a41e46d..102117f82e9 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3926,7 +3926,8 @@ The method used must be an out-of-band method."
 
         ;; Set the mode.
         (unless (and keep-date copy-keep-date)
-          (set-file-modes newname (tramp-default-file-modes filename))))
+          (ignore-errors
+            (set-file-modes newname (tramp-default-file-modes filename)))))
 
       ;; If the operation was `rename', delete the original file.
       (unless (eq op 'copy)
@@ -5031,7 +5032,10 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
           ;; filename does not exist (eq modes nil) it has been
           ;; renamed to the backup file.  This case `save-buffer'
           ;; handles permissions.
-          (when modes (set-file-modes tmpfile modes))
+          ;; Ensure, that it is still readable.
+          (when modes
+            (set-file-modes
+             tmpfile (logior (or modes 0) (tramp-octal-to-decimal "0400"))))
 
           ;; This is a bit lengthy due to the different methods
           ;; possible for file transfer.  First, we check whether the