- (stevesk) fix x11 forwarding from _PATH_XAUTH change

diff --git a/ChangeLog b/ChangeLog
index 0f9da952b16ef8aed83587d03cf9c1c0fc2bf12a..83c2f8c756305656a28f21f54530da2510ab2095 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
  - (stevesk) for HP-UX 11.X use X/Open socket interface;
     pulls in modern socket prototypes and eliminates a number of compiler
     warnings.  see xopen_networking(7).
+ - (stevesk) fix x11 forwarding from _PATH_XAUTH change
 
 20010625
  - OpenBSD CVS Sync

diff --git a/defines.h b/defines.h
index 4243d8f29c8c37303050788ffff2828e92ec7511..6d66b8bd39221e7edd2e9d5a5e3dcb267e54cd61 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -335,8 +335,8 @@ struct winsize {
 #endif
 
 /* Define this to be the path of the xauth program. */
-#ifndef XAUTH_PATH
-#define XAUTH_PATH "/usr/X11R6/bin/xauth"
+#ifdef XAUTH_PATH
+#define _PATH_XAUTH XAUTH_PATH
 #endif /* XAUTH_PATH */
 
 #ifndef _PATH_TTY

diff --git a/pathnames.h b/pathnames.h
index 54c2c131972232f0e81b1731df0bca587eebd1bd..0470a21596a3060a5b433f35beedd392e11c6e48 100644 (file)
--- a/pathnames.h
+++ b/pathnames.h
@@ -118,6 +118,11 @@
 #define _PATH_SSH_ASKPASS_DEFAULT      "/usr/X11R6/bin/ssh-askpass"
 #endif
 
+/* xauth for X11 forwarding */
+#ifndef _PATH_XAUTH
+#define _PATH_XAUTH                    "/usr/X11R6/bin/xauth"
+#endif
+
 /* for scp */
 #ifndef _PATH_CP
 #define _PATH_CP                       "cp"
@@ -154,4 +159,3 @@
 #ifndef SSH_PRNG_COMMAND_FILE
 # define SSH_PRNG_COMMAND_FILE   ETCDIR "/ssh_prng_cmds"
 #endif /* SSH_PRNG_COMMAND_FILE */
-