aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2007-01-10 03:51:24 +0000
committerStefan Monnier2007-01-10 03:51:24 +0000
commitda6657b760600f563720dedaf6dba1668f458bc2 (patch)
tree75bbc9b53380e06c4f9434e0b8eef3a5108f587f
parentc5c6b2cc681fec1d9a1596d9378deea9a2b69656 (diff)
downloademacs-da6657b760600f563720dedaf6dba1668f458bc2.tar.gz
emacs-da6657b760600f563720dedaf6dba1668f458bc2.zip
(server-ensure-safe-dir): UIDs may be floats.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/server.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3c620179cc..17145837a6e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-01-10 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * server.el (server-ensure-safe-dir): UIDs may be floats.
4
12007-01-10 Richard Stallman <rms@gnu.org> 52007-01-10 Richard Stallman <rms@gnu.org>
2 6
3 * battery.el (battery-linux-proc-acpi): Use ignore-errors 7 * battery.el (battery-linux-proc-acpi): Use ignore-errors
diff --git a/lisp/server.el b/lisp/server.el
index 3ae585e9bc4..beb065ef437 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,7 +1,7 @@
1;;; server.el --- Lisp code for GNU Emacs running as server process 1;;; server.el --- Lisp code for GNU Emacs running as server process
2 2
3;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 3;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
4;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. 4;; 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
5 5
6;; Author: William Sommerfeld <wesommer@athena.mit.edu> 6;; Author: William Sommerfeld <wesommer@athena.mit.edu>
7;; Maintainer: FSF 7;; Maintainer: FSF
@@ -298,7 +298,7 @@ Creates the directory if necessary and makes sure:
298 (letf (((default-file-modes) ?\700)) (make-directory dir t)) 298 (letf (((default-file-modes) ?\700)) (make-directory dir t))
299 (setq attrs (file-attributes dir))) 299 (setq attrs (file-attributes dir)))
300 ;; Check that it's safe for use. 300 ;; Check that it's safe for use.
301 (unless (and (eq t (car attrs)) (eq (nth 2 attrs) (user-uid)) 301 (unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid))
302 (or (eq system-type 'windows-nt) 302 (or (eq system-type 'windows-nt)
303 (zerop (logand ?\077 (file-modes dir))))) 303 (zerop (logand ?\077 (file-modes dir)))))
304 (error "The directory %s is unsafe" dir)))) 304 (error "The directory %s is unsafe" dir))))