diff options
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 9 | ||||
| -rw-r--r-- | lisp/net/tramp-smb.el | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 81b4978dba5..6dd5005a36e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2012-12-30 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp-sh.el (tramp-sh-handle-set-file-selinux-context): + Return `t' on success. + + * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add + handler for `set-file-selinux-context'. + 2012-12-29 Michael Albinus <michael.albinus@gmx.de> * net/tramp-sh.el (tramp-sh-handle-file-acl): Suppress basic attributes. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index ebc377c08c8..a76bac72dcf 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1530,10 +1530,11 @@ and gid of the corresponding user is taken. Both parameters must be integers." (if (stringp (nth 3 context)) (format "--range=%s" (nth 3 context)) "") (tramp-shell-quote-argument localname)))) - (tramp-set-file-property v localname "file-selinux-context" context) - (tramp-set-file-property v localname "file-selinux-context" 'undef))) - ;; We always return nil. - nil) + (progn + (tramp-set-file-property v localname "file-selinux-context" context) + t) + (tramp-set-file-property v localname "file-selinux-context" 'undef) + nil))) (defun tramp-remote-acl-p (vec) "Check, whether ACL is enabled on the remote host." diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index f97d4620b97..af1e36350f5 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -230,7 +230,7 @@ See `tramp-actions-before-shell' for more info.") (rename-file . tramp-smb-handle-rename-file) (set-file-acl . ignore) (set-file-modes . tramp-smb-handle-set-file-modes) - ;; `set-file-selinux-context' performed by default handler. + (set-file-selinux-context . ignore) (set-file-times . ignore) (set-visited-file-modtime . ignore) (shell-command . tramp-handle-shell-command) |