Mercurial > emacs
changeset 108064:589643be353e
* net/tramp.el (tramp-handle-copy-file): Add new optional
parameter `preserve-selinux-context'.
(tramp-file-name-for-operation): Add `set-file-selinux-context'.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Thu, 22 Apr 2010 11:15:27 +0200 |
| parents | 9b41305fbde0 |
| children | 186cf99d4122 |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Apr 22 08:25:46 2010 +0000 +++ b/lisp/ChangeLog Thu Apr 22 11:15:27 2010 +0200 @@ -1,5 +1,9 @@ 2010-04-22 Michael Albinus <michael.albinus@gmx.de> + * net/tramp.el (tramp-handle-copy-file): Add new optional + parameter `preserve-selinux-context'. + (tramp-file-name-for-operation): Add `set-file-selinux-context'. + * net/tramp.el (tramp-completion-handle-file-name-all-completions): Ensure, that non remote files are still checked. Oops.
--- a/lisp/net/tramp.el Thu Apr 22 08:25:46 2010 +0000 +++ b/lisp/net/tramp.el Thu Apr 22 11:15:27 2010 +0200 @@ -3437,7 +3437,8 @@ (buffer-name)))))) (defun tramp-handle-copy-file - (filename newname &optional ok-if-already-exists keep-date preserve-uid-gid) + (filename newname &optional ok-if-already-exists keep-date + preserve-uid-gid preserve-selinux-context) "Like `copy-file' for Tramp files." ;; Check if both files are local -- invoke normal copy-file. ;; Otherwise, use Tramp from local system. @@ -5326,7 +5327,7 @@ 'dired-compress-file 'dired-uncache 'file-accessible-directory-p 'file-attributes 'file-directory-p 'file-executable-p 'file-exists-p - 'file-local-copy 'file-remote-p 'file-modes 'file-selinux-context + 'file-local-copy 'file-remote-p 'file-modes 'file-name-as-directory 'file-name-directory 'file-name-nondirectory 'file-name-sans-versions 'file-ownership-preserved-p 'file-readable-p @@ -5338,6 +5339,8 @@ 'unhandled-file-name-directory 'vc-registered ;; Emacs 22+ only. 'set-file-times + ;; Emacs 24+ only. + 'file-selinux-context 'set-file-selinux-context ;; XEmacs only. 'abbreviate-file-name 'create-file-buffer 'dired-file-modtime 'dired-make-compressed-filename @@ -8678,6 +8681,7 @@ ;; on remote hosts. ;; * Use secrets.el for password handling. ;; * Load ~/.emacs_SHELLNAME on the remote host for `shell'. +;; * Implement selinux-context. ;; Functions for file-name-handler-alist: ;; diff-latest-backup-file -- in diff.el