From 197b6f3c605872bfeb7b2024d255142d8f579021 Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 17 Apr 2012 19:05:22 +0200
Subject: [PATCH] lisp/server.el (server-ensure-safe-dir): Simplify.

---
 lisp/ChangeLog |  4 ++++
 lisp/server.el | 42 +++++++++++++++++++-----------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 992fee42c28..d9aadbe0f22 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/server.el b/lisp/server.el
index 058bc55d87d..c82a639eadf 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -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)))))
 
-- 
2.11.4.GIT