diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-03-12 11:19:47 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-03-12 11:19:47 -0800 |
| commit | 09d9db2c4921cb2eb0974892164dd03d6bffdd80 (patch) | |
| tree | 7165f97f16ea0eaab567db2a45f69d1cdf66bdce /lisp/server.el | |
| parent | 54ce11a161cd756047fccdfc128dc0527692ea06 (diff) | |
| parent | 6efb972c00a9ea8ffa84118199aa59c2d3a3b50e (diff) | |
| download | emacs-09d9db2c4921cb2eb0974892164dd03d6bffdd80.tar.gz | |
Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann@ics.uci.edu
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el index df8cae0a6af..cb1903ad96c 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -485,7 +485,13 @@ See variable `server-auth-dir' for details." (file-name-as-directory dir)) :warning) (throw :safe t)) - (unless (eql uid (user-uid)) ; is the dir ours? + (unless (or (= uid (user-uid)) ; is the dir ours? + (and w32 + ;; Files created on Windows by + ;; Administrator (RID=500) have + ;; the Administrators (RID=544) + ;; group recorded as the owner. + (= uid 544) (= (user-uid) 500))) (throw :safe nil)) (when w32 ; on NTFS? (throw :safe t)) |