From: Stefan Monnier Date: Wed, 10 Jan 2007 03:51:24 +0000 (+0000) Subject: (server-ensure-safe-dir): UIDs may be floats. X-Git-Tag: emacs-pretest-22.0.93~179 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=da6657b760600f563720dedaf6dba1668f458bc2;p=emacs.git (server-ensure-safe-dir): UIDs may be floats. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b3c620179cc..17145837a6e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-01-10 Stefan Monnier + + * server.el (server-ensure-safe-dir): UIDs may be floats. + 2007-01-10 Richard Stallman * 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 @@ ;;; server.el --- Lisp code for GNU Emacs running as server process ;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. ;; Author: William Sommerfeld ;; Maintainer: FSF @@ -298,7 +298,7 @@ Creates the directory if necessary and makes sure: (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)) (eq (nth 2 attrs) (user-uid)) + (unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid)) (or (eq system-type 'windows-nt) (zerop (logand ?\077 (file-modes dir))))) (error "The directory %s is unsafe" dir))))