Mercurial > emacs
changeset 73604:3b0b74acfa45
Try and fit within 80 columns.
(server-start): Make the auth file unreadable by other users.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 01 Nov 2006 21:37:11 +0000 |
| parents | e89055c0c7ab |
| children | f89141aaba7c |
| files | lisp/ChangeLog lisp/server.el |
| diffstat | 2 files changed, 33 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Nov 01 20:25:51 2006 +0000 +++ b/lisp/ChangeLog Wed Nov 01 21:37:11 2006 +0000 @@ -1,3 +1,8 @@ +2006-11-01 Stefan Monnier <monnier@iro.umontreal.ca> + + * server.el: Try and fit within 80 columns. + (server-start): Make the auth file unreadable by other users. + 2006-10-31 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * battery.el (battery-linux-proc-acpi): Prevent range error when
--- a/lisp/server.el Wed Nov 01 20:25:51 2006 +0000 +++ b/lisp/server.el Wed Nov 01 21:37:11 2006 +0000 @@ -185,7 +185,7 @@ :version "21.1") (or (assq 'server-buffer-clients minor-mode-alist) - (setq minor-mode-alist (cons '(server-buffer-clients " Server") minor-mode-alist))) + (push '(server-buffer-clients " Server") minor-mode-alist)) (defvar server-existing-buffer nil "Non-nil means the buffer existed before the server was asked to visit it. @@ -306,10 +306,11 @@ Prefix arg means just kill any existing server communications subprocess." (interactive "P") (when server-process - ;; kill it dead! + ;; kill it dead! (ignore-errors (delete-process server-process)) (ignore-errors - ;; Delete the socket or authentication files made by previous server invocations. + ;; Delete the socket or authentication files made by previous + ;; server invocations. (if (eq (process-contact server-process :family) 'local) (delete-file (expand-file-name server-name server-socket-dir)) (setq server-auth-key nil) @@ -321,7 +322,8 @@ ;; Now any previous server is properly stopped. (unless leave-dead ;; Make sure there is a safe directory in which to place the socket. - (server-ensure-safe-dir (if server-use-tcp server-auth-dir server-socket-dir)) + (server-ensure-safe-dir + (if server-use-tcp server-auth-dir server-socket-dir)) (when server-process (server-log (message "Restarting server"))) (letf (((default-file-modes) ?\700)) @@ -332,11 +334,11 @@ :noquery t :sentinel 'server-sentinel :filter 'server-process-filter - ;; We must receive file names without being decoded. - ;; Those are decoded by server-process-filter according - ;; to file-name-coding-system. + ;; We must receive file names without being decoded. + ;; Those are decoded by server-process-filter according + ;; to file-name-coding-system. :coding 'raw-text - ;; The rest of the arguments depend on the kind of socket used + ;; The rest of the args depends on the kind of socket used. (if server-use-tcp (list :family nil :service t @@ -344,20 +346,22 @@ :plist '(:authenticated nil)) (list :family 'local :service (expand-file-name server-name server-socket-dir) - :plist '(:authenticated t)))))) - (unless server-process (error "Could not start server process")) - (when server-use-tcp - (setq server-auth-key - (loop - ;; The auth key is a 64-byte string of random chars in the range `!'..`~'. - for i below 64 - collect (+ 33 (random 94)) into auth - finally return (concat auth))) - (with-temp-file (expand-file-name server-name server-auth-dir) - (set-buffer-multibyte nil) - (setq buffer-file-coding-system 'no-conversion) - (insert (format-network-address (process-contact server-process :local)) - "\n" server-auth-key))))) + :plist '(:authenticated t))))) + (unless server-process (error "Could not start server process")) + (when server-use-tcp + (setq server-auth-key + (loop + ;; The auth key is a 64-byte string of random chars in the + ;; range `!'..`~'. + for i below 64 + collect (+ 33 (random 94)) into auth + finally return (concat auth))) + (with-temp-file (expand-file-name server-name server-auth-dir) + (set-buffer-multibyte nil) + (setq buffer-file-coding-system 'no-conversion) + (insert (format-network-address + (process-contact server-process :local)) + "\n" server-auth-key)))))) ;;;###autoload (define-minor-mode server-mode @@ -444,7 +448,8 @@ (let ((standard-output (current-buffer))) (if errorp (princ "error: ")) (pp v) - ;; Suppress the error rose when the pipe to PROC is closed. + ;; Suppress the error signalled when the pipe to + ;; PROC is closed. (condition-case err (process-send-region proc (point-min) (point-max)) (file-error nil)