diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2017-10-21 11:52:24 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2017-10-21 15:19:14 -0400 |
| commit | d719ea6ad5419bba2b376384c370dc2744dc718f (patch) | |
| tree | 1574a6055c173e0eb75b80a1fd943b67ff09dc8d | |
| parent | b060e091c35e8482e0e091a214cf5afe5039bd0e (diff) | |
| download | emacs-d719ea6ad5419bba2b376384c370dc2744dc718f.tar.gz | |
Another fix for unsafe directory error message (Bug#865)
* lisp/server.el (server-ensure-safe-dir): Put file owner's uid, not
current user's for the wrong owner case. Show expanded file name in
error message.
| -rw-r--r-- | lisp/server.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/server.el b/lisp/server.el index 33800a98682..4c591a5ee7c 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -546,14 +546,15 @@ See variable `server-auth-dir' for details." ;; group recorded as the owner. (/= uid 544) (/= (user-uid) 500))) (format "it is not owned by you (owner = %s (%d))" - (user-full-name (user-uid)) (user-uid))) + (user-full-name uid) uid)) (w32 nil) ; on NTFS? ((/= 0 (logand ?\077 (file-modes dir))) (format "it is accessible by others (%03o)" (file-modes dir))) (t nil)))) (when unsafe - (error "`%s' is not a safe directory because %s" dir unsafe))))) + (error "`%s' is not a safe directory because %s" + (expand-file-name dir) unsafe))))) (defun server-generate-key () "Generate and return a random authentication key. |