diff options
| author | des <des@FreeBSD.org> | 2015-11-26 23:05:40 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2015-11-26 23:05:40 +0000 |
| commit | 954c038d83b067da45db2a8385b0c5cbad02cb60 (patch) | |
| tree | d763caa6e6392428ab2ca15370887c0aa362cd7d /crypto | |
| parent | c168857c6a011a2443e739499748a0c19fb66390 (diff) | |
| download | FreeBSD-src-954c038d83b067da45db2a8385b0c5cbad02cb60.zip FreeBSD-src-954c038d83b067da45db2a8385b0c5cbad02cb60.tar.gz | |
r291198 inadvertantly reverted a local patch for the default location
of ssh-askpass and xauth, breaking X11 forwarding.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssh/pathnames.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 */ |
