From 954c038d83b067da45db2a8385b0c5cbad02cb60 Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Thu, 26 Nov 2015 23:05:40 +0000
Subject: r291198 inadvertantly reverted a local patch for the default location
 of ssh-askpass and xauth, breaking X11 forwarding.

---
 crypto/openssh/pathnames.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'crypto')

diff --git a/crypto/openssh/pathnames.h b/crypto/openssh/pathnames.h
index ec89fc6..e53d67a 100644
--- a/crypto/openssh/pathnames.h
+++ b/crypto/openssh/pathnames.h
@@ -1,4 +1,5 @@
 /* $OpenBSD: pathnames.h,v 1.24 2013/12/06 13:39:49 markus Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -121,7 +122,7 @@
  * Default location of askpass
  */
 #ifndef _PATH_SSH_ASKPASS_DEFAULT
-#define _PATH_SSH_ASKPASS_DEFAULT	"/usr/X11R6/bin/ssh-askpass"
+#define _PATH_SSH_ASKPASS_DEFAULT	"/usr/local/bin/ssh-askpass"
 #endif
 
 /* Location of ssh-keysign for hostbased authentication */
@@ -136,7 +137,7 @@
 
 /* xauth for X11 forwarding */
 #ifndef _PATH_XAUTH
-#define _PATH_XAUTH			"/usr/X11R6/bin/xauth"
+#define _PATH_XAUTH			"/usr/local/bin/xauth"
 #endif
 
 /* UNIX domain socket for X11 server; displaynum will replace %u */
-- 
cgit v1.1