summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2017-09-25 17:52:24 +0200
committerMichael Albinus <michael.albinus@gmx.de>2017-09-25 17:52:24 +0200
commit49cd561dc62ea6b3fbedab7aef0f020733f4cf09 (patch)
tree8629035f25cf52e039d55250af93ed6aa49c9041 /lisp
parentb719f6b20ba00c86d860be113d8a842bc384f2df (diff)
downloademacs-49cd561dc62ea6b3fbedab7aef0f020733f4cf09.tar.gz
* test/lisp/tramp-tests.el (tramp-test21-file-links): Special code for smb.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp-smb.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index ee6baaab121..35aa8110946 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -535,7 +535,7 @@ pass to the OPERATION."
;; Reset the transfer process properties.
(tramp-set-connection-property v "process-name" nil)
(tramp-set-connection-property v "process-buffer" nil)
- (when t1 (delete-directory tmpdir 'recurse))))
+ (when t1 (delete-directory tmpdir 'recursive))))
;; Handle KEEP-DATE argument.
(when keep-date
@@ -1583,6 +1583,10 @@ If VEC has no cifs capabilities, exchange \"/\" by \"\\\\\"."
"Read entries which match DIRECTORY.
Either the shares are listed, or the `dir' command is executed.
Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)."
+ ;; If CIFS capabilities are enabled, symlinks are not listed
+ ;; by `dir'. This is a consequence of
+ ;; <https://www.samba.org/samba/news/symlink_attack.html>. See also
+ ;; <https://bugzilla.samba.org/show_bug.cgi?id=5116>.
(with-parsed-tramp-file-name (file-name-as-directory directory) nil
(setq localname (or localname "/"))
(with-tramp-file-property v localname "file-entries"