Date: Tuesday, November 16, 2010 @ 14:13:56 Author: rtoy Path: /project/cmucl/cvsroot/src/clx

Modified: display.lisp

GET-BEST-AUTHORIZATION wasn't handling the case of a :local connection where the xauth file only contained one entry for localhost/unix:0. When the protocol is :local, we explicitly check for localhost. Previously, the host-address was converted the hostname, which isn't "localhost".

--------------+ display.lisp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

Index: src/clx/display.lisp diff -u src/clx/display.lisp:1.15 src/clx/display.lisp:1.16 --- src/clx/display.lisp:1.15 Mon Jul 13 09:54:35 2009 +++ src/clx/display.lisp Tue Nov 16 14:13:55 2010 @@ -19,7 +19,7 @@ ;;;

#+cmu -(ext:file-comment "$Id: display.lisp,v 1.15 2009-07-13 13:54:35 rtoy Rel $") +(ext:file-comment "$Id: display.lisp,v 1.16 2010-11-16 19:13:55 rtoy Exp $")

(in-package :xlib)

@@ -117,7 +117,9 @@ (read-xauth-entry stream) (unless family (return)) (when (and (eql family protocol) - (equal host-address address) + (or (equal host-address address) + (and (eql family :local) + (equal address "localhost"))) (= number display) (let ((pos1 (position name *known-authorizations* :test #'string=)))