Deleted Added
full compact
2d1
< /* $FreeBSD: head/crypto/openssh/pathnames.h 98684 2002-06-23 16:09:08Z des $ */
16a16,17
>
> #ifndef SSHDIR
17a19,21
> #endif
>
> #ifndef _PATH_SSH_PIDDIR
18a23
> #endif
40a46
> #ifndef _PATH_SSH_PROGRAM
41a48
> #endif
111a119
> #ifndef _PATH_SSH_ASKPASS_DEFAULT
112a121
> #endif
115c124,126
< #define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign"
---
> #ifndef _PATH_SSH_KEY_SIGN
> #define _PATH_SSH_KEY_SIGN "/usr/libexec/ssh-keysign"
> #endif
117a129
> #ifndef _PATH_XAUTH
118a131
> #endif
120a134
> #ifndef _PATH_UNIX_X
121a136
> #endif
122a138,142
> /* for scp */
> #ifndef _PATH_CP
> #define _PATH_CP "cp"
> #endif
>
123a144
> #ifndef _PATH_SFTP_SERVER
125c146
< #define _PATH_LS "ls"
---
> #endif
127a149
> #ifndef _PATH_PRIVSEP_CHROOT_DIR
128a151,169
> #endif
>
> #ifndef _PATH_LS
> #define _PATH_LS "ls"
> #endif
>
> /* path to login program */
> #ifndef LOGIN_PROGRAM
> # ifdef LOGIN_PROGRAM_FALLBACK
> # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK
> # else
> # define LOGIN_PROGRAM "/usr/bin/login"
> # endif
> #endif /* LOGIN_PROGRAM */
>
> /* Askpass program define */
> #ifndef ASKPASS_PROGRAM
> #define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass"
> #endif /* ASKPASS_PROGRAM */