Author: des Date: Thu Nov 26 23:05:40 2015 New Revision: 291375 URL: https://svnweb.freebsd.org/changeset/base/291375
Log: r291198 inadvertantly reverted a local patch for the default location of ssh-askpass and xauth, breaking X11 forwarding. Modified: head/crypto/openssh/pathnames.h Modified: head/crypto/openssh/pathnames.h ============================================================================== --- head/crypto/openssh/pathnames.h Thu Nov 26 21:35:50 2015 (r291374) +++ head/crypto/openssh/pathnames.h Thu Nov 26 23:05:40 2015 (r291375) @@ -1,4 +1,5 @@ /* $OpenBSD: pathnames.h,v 1.24 2013/12/06 13:39:49 markus Exp $ */ +/* $FreeBSD$ */ /* * Author: Tatu Ylonen <[email protected]> @@ -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 */ _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "[email protected]"
