[Emacs-diffs] emacs/lisp server.el [EMACS_23_1_RC]

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Eli Zaretskii <eliz>    09/08/22 10:06:31

Modified files:
        lisp           : server.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/server.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.192&r2=1.192.2.1

Patches:
Index: server.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/server.el,v
retrieving revision 1.192
retrieving revision 1.192.2.1
diff -u -b -r1.192 -r1.192.2.1
--- server.el   10 Mar 2009 14:09:26 -0000      1.192
+++ server.el   22 Aug 2009 10:06:31 -0000      1.192.2.1
@@ -452,9 +452,10 @@
     (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))))