Fixed default SSH_ASKPASS

This commit is contained in:
Damien Miller 1999-12-07 14:54:53 +11:00
parent 0c078c6633
commit 3bc14dde05
3 changed files with 6 additions and 3 deletions

View File

@ -1,6 +1,7 @@
19991207 19991207
- sshd Redhat init script patch from Jim Knoble <jmknoble@pobox.com> - sshd Redhat init script patch from Jim Knoble <jmknoble@pobox.com>
fixes compatability with 4.x and 5.x fixes compatability with 4.x and 5.x
- Fixed default SSH_ASKPASS
19991204 19991204
- Small cleanup of PAM code in sshd.c - Small cleanup of PAM code in sshd.c

View File

@ -10,7 +10,7 @@ SSH_PROGRAM=@bindir@/ssh
ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass
CC=@CC@ CC=@CC@
PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ CFLAGS=@CFLAGS@ $(PATHS) @DEFS@
EXTRA_TARGETS=@GNOME_ASKPASS@ EXTRA_TARGETS=@GNOME_ASKPASS@
TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)

6
ssh.h
View File

@ -13,7 +13,7 @@
* *
*/ */
/* RCSID("$Id: ssh.h,v 1.17 1999/12/06 00:47:29 damien Exp $"); */ /* RCSID("$Id: ssh.h,v 1.18 1999/12/07 03:54:53 damien Exp $"); */
#ifndef SSH_H #ifndef SSH_H
#define SSH_H #define SSH_H
@ -173,7 +173,9 @@
* Default path to ssh-askpass used by ssh-add, * Default path to ssh-askpass used by ssh-add,
* environment variable for overwriting the default location * environment variable for overwriting the default location
*/ */
#define SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" #ifndef SSH_ASKPASS_DEFAULT
# define SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass"
#endif
#define SSH_ASKPASS_ENV "SSH_ASKPASS" #define SSH_ASKPASS_ENV "SSH_ASKPASS"
/* /*