(server-ensure-safe-dir): Disable the security check for Windows.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ce3493a2b62d4b917989b2ac296b94559446ea1..f683afb9cfd9713862934f265598f7cffbe3ae48 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+       * server.el (server-ensure-safe-dir): Disable the security check
+       for Windows.
+
 2009-08-18  Kenichi Handa  <handa@m17n.org>
 
        * textmodes/paragraphs.el: Change to utf-8.  Adjust coding cookie.

diff --git a/lisp/server.el b/lisp/server.el
index 10b08ad4a3bd8513ef75d1160d11be5b19455061..cf3088931136e2d92ea05688156c8b5145431af0 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -452,9 +452,10 @@ Creates the directory if necessary and makes sure:
     (unless attrs
       (letf (((default-file-modes) ?\700)) (make-directory dir t))
       (setq attrs (file-attributes dir)))
-    ;; Check that it's safe for use.
-    (unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid))
-                 (or (eq system-type 'windows-nt)
+    ;; Check that it's safe for use.  Windows doesn't support
+    ;; Posix-style file security, so don't check there.
+    (unless (or (eq system-type 'windows-nt)
+               (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid))
                      (zerop (logand ?\077 (file-modes dir)))))
       (error "The directory %s is unsafe" dir))))