From 25f14cdb5a3608adb3d71e15ff15cdafe5a52434 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 22 Apr 2010 11:15:27 +0200 Subject: [PATCH] * net/tramp.el (tramp-handle-copy-file): Add new optional parameter `preserve-selinux-context'. (tramp-file-name-for-operation): Add `set-file-selinux-context'. --- lisp/ChangeLog | 4 ++++ lisp/net/tramp.el | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) mode change 100644 => 100755 lisp/ChangeLog mode change 100644 => 100755 lisp/net/tramp.el diff --git a/lisp/ChangeLog b/lisp/ChangeLog old mode 100644 new mode 100755 index e701f59554b..d7c32848543 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2010-04-22 Michael Albinus + * 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. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el old mode 100644 new mode 100755 index 05f7b94edda..6959879e677 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3437,7 +3437,8 @@ tramp-handle-file-name-all-completions: internal error accessing `%s': `%s'" (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 @@ ARGS are the arguments OPERATION has been called with." '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 @@ ARGS are the arguments OPERATION has been called with." '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 @@ Only works for Bourne-like shells." ;; 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 -- 2.39.5