diff options
| author | Karoly Lorentey | 2007-01-13 22:59:28 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2007-01-13 22:59:28 +0000 |
| commit | 38db5c8d522cc1faa8190e77dbc932a5560e6aad (patch) | |
| tree | efe4c81d7210843bb208282461ebce12c5bd3daf /lisp/server.el | |
| parent | 191ae1cf7cd2571277635b3b8e488e773ca5c9b9 (diff) | |
| parent | b4ec8cb4e66f94547e8215a1c1eb6cda3b83ca63 (diff) | |
| download | emacs-38db5c8d522cc1faa8190e77dbc932a5560e6aad.tar.gz emacs-38db5c8d522cc1faa8190e77dbc932a5560e6aad.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-592
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-593
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-594
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-595
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-596
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-597
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-598
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-186
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-187
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-188
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-189
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-190
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-191
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-593
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/server.el b/lisp/server.el index 7a4179e85f6..dd64bb6cf89 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 |
| @@ -435,7 +435,7 @@ Creates the directory if necessary and makes sure: | |||
| 435 | (letf (((default-file-modes) ?\700)) (make-directory dir t)) | 435 | (letf (((default-file-modes) ?\700)) (make-directory dir t)) |
| 436 | (setq attrs (file-attributes dir))) | 436 | (setq attrs (file-attributes dir))) |
| 437 | ;; Check that it's safe for use. | 437 | ;; Check that it's safe for use. |
| 438 | (unless (and (eq t (car attrs)) (eq (nth 2 attrs) (user-uid)) | 438 | (unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid)) |
| 439 | (or (eq system-type 'windows-nt) | 439 | (or (eq system-type 'windows-nt) |
| 440 | (zerop (logand ?\077 (file-modes dir))))) | 440 | (zerop (logand ?\077 (file-modes dir))))) |
| 441 | (error "The directory %s is unsafe" dir)))) | 441 | (error "The directory %s is unsafe" dir)))) |