ssh/sshd: path to xauth vs. X11R7

[Hubert Feyrer <hubert%feyrer.de@localhost>]

when building with MKXORG=yes, paths to xauth and ssh-askpass are 
hardcoded to /usr/X11R6 (see src/crypto/dist/ssh/pathnames.h).
The patch below fixes this, but I'm unsure if touching src/crypto/dist/ssh 
is an option. If not, what else can we do?


 - Hubert

Index: usr.bin/ssh/Makefile.inc
===================================================================
RCS file: /cvsroot/src/usr.bin/ssh/Makefile.inc,v
retrieving revision 1.16
diff -u -r1.16 Makefile.inc
--- usr.bin/ssh/Makefile.inc    6 Apr 2008 09:54:37 -0000       1.16
+++ usr.bin/ssh/Makefile.inc    18 Oct 2008 01:27:50 -0000
@@ -25,6 +25,10 @@
 CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5 -DHEIMDAL
 .endif

+.if (${MKXORG} != "no")
+CPPFLAGS+=-DX11BASE=\"/usr/X11R7\"
+.endif
+
 CPPFLAGS+=-DSUPPORT_UTMP -DSUPPORT_UTMPX
 CPPFLAGS+=-DLIBWRAP

Index: crypto/dist/ssh/pathnames.h
===================================================================
RCS file: /cvsroot/src/crypto/dist/ssh/pathnames.h,v
retrieving revision 1.15
diff -u -r1.15 pathnames.h
--- crypto/dist/ssh/pathnames.h 28 Sep 2006 21:22:14 -0000      1.15
+++ crypto/dist/ssh/pathnames.h 18 Oct 2008 01:27:50 -0000
@@ -107,15 +107,22 @@
 #define _PATH_RHOSTS_EQUIV             "/etc/hosts.equiv"

 /*
+ * X11 base directory
+ */
+#ifndef X11BASE
+#define X11BASE                                "/usr/X11R6"
+#endif
+
+/*
  * Default location of askpass
  */
-#define _PATH_SSH_ASKPASS_DEFAULT      "/usr/X11R6/bin/ssh-askpass"
+#define _PATH_SSH_ASKPASS_DEFAULT      X11BASE "/bin/ssh-askpass"

 /* Location of ssh-keysign for hostbased authentication */
 #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"