Fix comparisons of file ownership on MS-Windows for the Administrator user.

 lisp/files.el (file-ownership-preserved-p): Pass `integer' as an
 explicit 2nd argument to `file-attributes'.  If the file's owner
 is the Administrators group on Windows, and the current user is
 Administrator, consider that a match.
 lisp/server.el (server-ensure-safe-dir): Consider server directory
 safe on MS-Windows if its owner is the Administrators group while
 the current Emacs user is Administrator.  Use `=' to compare
 numerical UIDs, since they could be integers or floats.

1 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b8a7641b35..6685e355360 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2011-03-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.el (file-ownership-preserved-p): Pass `integer' as an
+        explicit 2nd argument to `file-attributes'.  If the file's owner
+        is the Administrators group on Windows, and the current user is
+        Administrator, consider that a match.
+
+        * server.el (server-ensure-safe-dir): Consider server directory
+        safe on MS-Windows if its owner is the Administrators group while
+        the current Emacs user is Administrator.  Use `=' to compare
+        numerical UIDs, since they could be integers or floats.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.