procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Another fix for unsafe directory error message (Bug#865)

Browse source 
* 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.
This commit is contained in:
Noam Postavsky 2017-10-21 11:52:24 -04:00
parent b060e091c3
commit d719ea6ad5
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/server.el
View file

@ -546,14 +546,15 @@ See variable `server-auth-dir' for details."
;; group recorded as the owner. ;; group recorded as the owner.
(/= uid 544) (/= (user-uid) 500))) (/= uid 544) (/= (user-uid) 500)))
(format "it is not owned by you (owner = %s (%d))" (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? (w32 nil) ; on NTFS?
((/= 0 (logand ?\077 (file-modes dir))) ((/= 0 (logand ?\077 (file-modes dir)))
(format "it is accessible by others (%03o)" (format "it is accessible by others (%03o)"
(file-modes dir))) (file-modes dir)))
(t nil)))) (t nil))))
(when unsafe (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 () (defun server-generate-key ()
"Generate and return a random authentication key. "Generate and return a random authentication key.