diff options
| author | Michael Albinus | 2017-09-25 17:52:24 +0200 |
|---|---|---|
| committer | Michael Albinus | 2017-09-25 17:52:24 +0200 |
| commit | 49cd561dc62ea6b3fbedab7aef0f020733f4cf09 (patch) | |
| tree | 8629035f25cf52e039d55250af93ed6aa49c9041 /lisp | |
| parent | b719f6b20ba00c86d860be113d8a842bc384f2df (diff) | |
| download | emacs-49cd561dc62ea6b3fbedab7aef0f020733f4cf09.tar.gz emacs-49cd561dc62ea6b3fbedab7aef0f020733f4cf09.zip | |
* test/lisp/tramp-tests.el (tramp-test21-file-links): Special code for smb.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/tramp-smb.el | 6 |
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." | |||
| 535 | ;; Reset the transfer process properties. | 535 | ;; Reset the transfer process properties. |
| 536 | (tramp-set-connection-property v "process-name" nil) | 536 | (tramp-set-connection-property v "process-name" nil) |
| 537 | (tramp-set-connection-property v "process-buffer" nil) | 537 | (tramp-set-connection-property v "process-buffer" nil) |
| 538 | (when t1 (delete-directory tmpdir 'recurse)))) | 538 | (when t1 (delete-directory tmpdir 'recursive)))) |
| 539 | 539 | ||
| 540 | ;; Handle KEEP-DATE argument. | 540 | ;; Handle KEEP-DATE argument. |
| 541 | (when keep-date | 541 | (when keep-date |
| @@ -1583,6 +1583,10 @@ If VEC has no cifs capabilities, exchange \"/\" by \"\\\\\"." | |||
| 1583 | "Read entries which match DIRECTORY. | 1583 | "Read entries which match DIRECTORY. |
| 1584 | Either the shares are listed, or the `dir' command is executed. | 1584 | Either the shares are listed, or the `dir' command is executed. |
| 1585 | Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)." | 1585 | Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)." |
| 1586 | ;; If CIFS capabilities are enabled, symlinks are not listed | ||
| 1587 | ;; by `dir'. This is a consequence of | ||
| 1588 | ;; <https://www.samba.org/samba/news/symlink_attack.html>. See also | ||
| 1589 | ;; <https://bugzilla.samba.org/show_bug.cgi?id=5116>. | ||
| 1586 | (with-parsed-tramp-file-name (file-name-as-directory directory) nil | 1590 | (with-parsed-tramp-file-name (file-name-as-directory directory) nil |
| 1587 | (setq localname (or localname "/")) | 1591 | (setq localname (or localname "/")) |
| 1588 | (with-tramp-file-property v localname "file-entries" | 1592 | (with-tramp-file-property v localname "file-entries" |