# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1168401084 0
# Node ID 54c43f5d4c8b6614d28472ad5dc0363de27be92d
# Parent  ea255892b6fd876e73f2906fc7295e0d56163a62
(server-ensure-safe-dir): UIDs may be floats.

diff -r ea255892b6fd -r 54c43f5d4c8b lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 10 03:50:19 2007 +0000
+++ b/lisp/ChangeLog	Wed Jan 10 03:51:24 2007 +0000
@@ -1,3 +1,7 @@
+2007-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* server.el (server-ensure-safe-dir): UIDs may be floats.
+
 2007-01-10  Richard Stallman  <rms@gnu.org>
 
 	* battery.el (battery-linux-proc-acpi): Use ignore-errors
diff -r ea255892b6fd -r 54c43f5d4c8b lisp/server.el
--- a/lisp/server.el	Wed Jan 10 03:50:19 2007 +0000
+++ b/lisp/server.el	Wed Jan 10 03:51:24 2007 +0000
@@ -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 <wesommer@athena.mit.edu>
 ;; Maintainer: FSF
@@ -298,7 +298,7 @@
       (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))))