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

lisp/server.el (server-ensure-safe-dir): Simplify.

Browse source
This commit is contained in:
Juanma Barranquero 2012-04-17 19:05:22 +02:00
parent d96a4f8829
commit 197b6f3c60
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2012-04-17 Juanma Barranquero <lekktu@gmail.com>
* server.el (server-ensure-safe-dir): Simplify.
2012-04-17 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/smie.el: Provide smarter auto-filling.

42
lisp/server.el
View file

@ -520,31 +520,27 @@ Creates the directory if necessary and makes sure:
;; Check that it's safe for use.
(let* ((uid (nth 2 attrs))
(w32 (eq system-type 'windows-nt))
(safe (catch :safe
(unless (eq t (car attrs)) ; is a dir?
(throw :safe nil))
(when (and w32 (zerop uid)) ; on FAT32?
(display-warning
'server
(format "Using `%s' to store Emacs-server authentication files.
(safe (cond
((not (eq t (car attrs))) nil) ; is a dir?
((and w32 (zerop uid)) ; on FAT32?
(display-warning
'server
(format "Using `%s' to store Emacs-server authentication files.
Directories on FAT32 filesystems are NOT secure against tampering.
See variable `server-auth-dir' for details."
(file-name-as-directory dir))
:warning)
(throw :safe t))
(unless (or (= uid (user-uid)) ; is the dir ours?
(and w32
;; Files created on Windows by
;; Administrator (RID=500) have
;; the Administrators (RID=544)
;; group recorded as the owner.
(= uid 544) (= (user-uid) 500)))
(throw :safe nil))
(when w32 ; on NTFS?
(throw :safe t))
(unless (zerop (logand ?\077 (file-modes dir)))
(throw :safe nil))
t)))
(file-name-as-directory dir))
:warning)
t)
((and (/= uid (user-uid)) ; is the dir ours?
(or (not w32)
;; Files created on Windows by Administrator
;; (RID=500) have the Administrators (RID=544)
;; group recorded as the owner.
(/= uid 544) (/= (user-uid) 500)))
nil)
(w32 t) ; on NTFS?
(t ; else, check permissions
(zerop (logand ?\077 (file-modes dir)))))))
(unless safe
(error "The directory `%s' is unsafe" dir)))))