Fix some edge cases of tramp-smb

* lisp/net/tramp-smb.el (tramp-smb-errors):
Add "NT_STATUS_REVISION_MISMATCH".
(tramp-smb-handle-delete-directory): Check, that the directory
has been removed indeed.
(tramp-smb-get-localname): Add further checks on filename syntax.

* lisp/net/tramp.el (tramp-localname-regexp): Do not allow linefeeds.

* test/lisp/net/tramp-tests.el (tramp-smb-get-localname): Declare.
(auth-source-save-behavior): Set it to nil.
(tramp-test01-file-name-syntax): Extend, checking for linefeeds.
(tramp-test03-file-name-host-rules, tramp--test-utf8): Refine tests.
(tramp-test03-file-name-method-rules): New test.
(tramp--test-ignore-add-name-to-file-error): New defmacro.
(tramp-test21-file-links): Use it.

2 files changed, 16 insertions, 2 deletions

diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 0e7386bf020..a4d0d53bf70 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -123,6 +123,7 @@ call, letting the SMB client use the default one."
          "ERRnoaccess"
          "ERRnomem"
          "ERRnosuchshare"
+         ;; See /usr/include/samba-4.0/core/ntstatus.h.
          ;; Windows 4.0 (Windows NT), Windows 5.0 (Windows 2000),
          ;; Windows 5.1 (Windows XP), Windows 5.2 (Windows Server 2003),
          ;; Windows 6.0 (Windows Vista), Windows 6.1 (Windows 7),
@@ -154,6 +155,7 @@ call, letting the SMB client use the default one."
          "NT_STATUS_OBJECT_PATH_SYNTAX_BAD"
          "NT_STATUS_PASSWORD_MUST_CHANGE"
          "NT_STATUS_RESOURCE_NAME_NOT_FOUND"
+         "NT_STATUS_REVISION_MISMATCH"
          "NT_STATUS_SHARING_VIOLATION"
          "NT_STATUS_TRUSTED_RELATIONSHIP_FAILURE"
          "NT_STATUS_UNSUCCESSFUL"
@@ -643,7 +645,12 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
           (goto-char (point-min))
           (search-forward-regexp tramp-smb-errors nil t)
           (tramp-error
-           v 'file-error "%s `%s'" (match-string 0) directory))))))
+           v 'file-error "%s `%s'" (match-string 0) directory)))
+
+      ;; "rmdir" does not report an error.  So we check ourselves.
+      (when (file-exists-p directory)
+        (tramp-error
+         v 'file-error "`%s' not removed." directory)))))
 
 (defun tramp-smb-handle-delete-file (filename &optional _trash)
   "Like `delete-file' for Tramp files."
@@ -1621,6 +1628,13 @@ If VEC has no cifs capabilities, exchange \"/\" by \"\\\\\"."
       (when (string-match "\\(\\$\\$\\)\\(/\\|$\\)" localname)
         (setq localname (replace-match "$" nil nil localname 1)))
 
+      ;; A period followed by a space, or trailing periods and spaces,
+      ;; are not supported.
+      (when (string-match "\\. \\|\\.$\\| $" localname)
+        (tramp-error
+         vec 'file-error
+         "Invalid file name %s" (tramp-make-tramp-file-name vec localname)))
+
       localname)))
 
 ;; Share names of a host are cached. It is very unlikely that the
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c394f28a561..5dda18f3a3b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -917,7 +917,7 @@ Used in `tramp-make-tramp-file-name'.")
   "Regexp matching delimiter between host names and localnames.
 Derived from `tramp-postfix-host-format'.")
 
-(defconst tramp-localname-regexp ".*$"
+(defconst tramp-localname-regexp "[^\n\r]*\\'"
   "Regexp matching localnames.")
 
 (defconst tramp-unknown-id-string "UNKNOWN"