- (stevesk) fix x11 forwarding from _PATH_XAUTH change
This commit is contained in:
parent
6a7b0de576
commit
37a777e98b
|
@ -13,6 +13,7 @@
|
||||||
- (stevesk) for HP-UX 11.X use X/Open socket interface;
|
- (stevesk) for HP-UX 11.X use X/Open socket interface;
|
||||||
pulls in modern socket prototypes and eliminates a number of compiler
|
pulls in modern socket prototypes and eliminates a number of compiler
|
||||||
warnings. see xopen_networking(7).
|
warnings. see xopen_networking(7).
|
||||||
|
- (stevesk) fix x11 forwarding from _PATH_XAUTH change
|
||||||
|
|
||||||
20010625
|
20010625
|
||||||
- OpenBSD CVS Sync
|
- OpenBSD CVS Sync
|
||||||
|
@ -5807,4 +5808,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- 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 $
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef _DEFINES_H
|
#ifndef _DEFINES_H
|
||||||
#define _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 */
|
/* Some platforms need this for the _r() functions */
|
||||||
#if !defined(_REENTRANT) && !defined(SNI)
|
#if !defined(_REENTRANT) && !defined(SNI)
|
||||||
|
@ -335,8 +335,8 @@ struct winsize {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Define this to be the path of the xauth program. */
|
/* Define this to be the path of the xauth program. */
|
||||||
#ifndef XAUTH_PATH
|
#ifdef XAUTH_PATH
|
||||||
#define XAUTH_PATH "/usr/X11R6/bin/xauth"
|
#define _PATH_XAUTH XAUTH_PATH
|
||||||
#endif /* XAUTH_PATH */
|
#endif /* XAUTH_PATH */
|
||||||
|
|
||||||
#ifndef _PATH_TTY
|
#ifndef _PATH_TTY
|
||||||
|
|
|
@ -118,6 +118,11 @@
|
||||||
#define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass"
|
#define _PATH_SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* xauth for X11 forwarding */
|
||||||
|
#ifndef _PATH_XAUTH
|
||||||
|
#define _PATH_XAUTH "/usr/X11R6/bin/xauth"
|
||||||
|
#endif
|
||||||
|
|
||||||
/* for scp */
|
/* for scp */
|
||||||
#ifndef _PATH_CP
|
#ifndef _PATH_CP
|
||||||
#define _PATH_CP "cp"
|
#define _PATH_CP "cp"
|
||||||
|
@ -154,4 +159,3 @@
|
||||||
#ifndef SSH_PRNG_COMMAND_FILE
|
#ifndef SSH_PRNG_COMMAND_FILE
|
||||||
# define SSH_PRNG_COMMAND_FILE ETCDIR "/ssh_prng_cmds"
|
# define SSH_PRNG_COMMAND_FILE ETCDIR "/ssh_prng_cmds"
|
||||||
#endif /* SSH_PRNG_COMMAND_FILE */
|
#endif /* SSH_PRNG_COMMAND_FILE */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue