* net/tramp.el (tramp-handle-insert-file-contents): For root,

preserve owner and group when editing files.  (Bug#7289)

Please contact me, if you have problems syncing with the trunk.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a6999a81c160ea129c28382294c0c32a83828d4..3944fdebc6999cf487e885000bb825ecaac460ee 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-30  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-handle-insert-file-contents): For root,
+       preserve owner and group when editing files.  (Bug#7289)
+
 2010-10-29  Glenn Morris  <rgm@gnu.org>
 
        * speedbar.el (speedbar-mode):

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 426785dd9a423e2a0a4b744e988d9fd8fc6ec15e..50fbaed01e0d3790812e58ce71137c87d726b9a0 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -5008,7 +5008,11 @@ coding system might not be determined.  This function repairs it."
            (setq buffer-file-name filename)
            (setq buffer-read-only (not (file-writable-p filename)))
            (set-visited-file-modtime)
-           (set-buffer-modified-p nil))
+           (set-buffer-modified-p nil)
+           ;; For root, preserve owner and group when editing files.
+           (when (string-equal (file-remote-p filename 'user) "root")
+             (set (make-local-variable 'backup-by-copying-when-mismatch) t)
+             (put 'backup-by-copying-when-mismatch 'permanent-local t)))
          (when (and (stringp local-copy)
                     (or remote-copy (null tramp-temp-buffer-file-name)))
            (delete-file local-copy))