Module Name: src
Committed By: njoly
Date: Wed Jun 10 16:14:29 UTC 2009
Modified Files:
src/crypto/external/bsd/openssh/dist: pathnames.h
Log Message:
Make _PATH_XAUTH use X11BASE prefix again, instead of hard-coded
"/usr/X11R6".
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/pathnames.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/pathnames.h
diff -u src/crypto/external/bsd/openssh/dist/pathnames.h:1.2 src/crypto/external/bsd/openssh/dist/pathnames.h:1.3
--- src/crypto/external/bsd/openssh/dist/pathnames.h:1.2 Sun Jun 7 22:38:47 2009
+++ src/crypto/external/bsd/openssh/dist/pathnames.h Wed Jun 10 16:14:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.2 2009/06/07 22:38:47 christos Exp $ */
+/* $NetBSD: pathnames.h,v 1.3 2009/06/10 16:14:29 njoly Exp $ */
/* $OpenBSD: pathnames.h,v 1.17 2008/12/29 02:23:26 stevesk Exp $ */
/*
@@ -122,7 +122,7 @@
#define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign"
/* xauth for X11 forwarding */
-#define _PATH_XAUTH "/usr/X11R6/bin/xauth"
+#define _PATH_XAUTH X11BASE "/bin/xauth"
/* UNIX domain socket for X11 server; displaynum will replace %u */
#define _PATH_UNIX_X "/tmp/.X11-unix/X%u"