- (stevesk) fix x11 forwarding from _PATH_XAUTH change
diff --git a/ChangeLog b/ChangeLog
index bb0d47b..cb6000c 100644
--- 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
@@ -5807,4 +5808,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1332 2001/06/27 16:32:24 stevesk Exp $
+$Id: ChangeLog,v 1.1333 2001/06/28 00:13:48 stevesk Exp $
diff --git a/defines.h b/defines.h
index 8a3d08c..1aaebc5 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.66 2001/06/10 17:35:46 mouring Exp $ */
+/* $Id: defines.h,v 1.67 2001/06/28 00:13:48 stevesk Exp $ */
/* Some platforms need this for the _r() functions */
#if !defined(_REENTRANT) && !defined(SNI)
@@ -335,8 +335,8 @@
#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 54c2c13..0470a21 100644
--- 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 */
-