Merge remote-tracking branch 'openssh/master' into latestw
This commit is contained in:
commit
5384c817cc
|
@ -166,15 +166,6 @@
|
||||||
#define _PATH_LS "ls"
|
#define _PATH_LS "ls"
|
||||||
#endif
|
#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 */
|
/* Askpass program define */
|
||||||
#ifndef ASKPASS_PROGRAM
|
#ifndef ASKPASS_PROGRAM
|
||||||
#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass"
|
#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass"
|
||||||
|
|
Loading…
Reference in New Issue