diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | ssh.h | 6 |
3 files changed, 6 insertions, 3 deletions
@@ -1,6 +1,7 @@ | |||
1 | 19991207 | 1 | 19991207 |
2 | - sshd Redhat init script patch from Jim Knoble <jmknoble@pobox.com> | 2 | - sshd Redhat init script patch from Jim Knoble <jmknoble@pobox.com> |
3 | fixes compatability with 4.x and 5.x | 3 | fixes compatability with 4.x and 5.x |
4 | - Fixed default SSH_ASKPASS | ||
4 | 5 | ||
5 | 19991204 | 6 | 19991204 |
6 | - Small cleanup of PAM code in sshd.c | 7 | - Small cleanup of PAM code in sshd.c |
diff --git a/Makefile.in b/Makefile.in index 55b851063..c2c3261b5 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -10,7 +10,7 @@ SSH_PROGRAM=@bindir@/ssh | |||
10 | ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass | 10 | ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass |
11 | 11 | ||
12 | CC=@CC@ | 12 | CC=@CC@ |
13 | PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" | 13 | PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" |
14 | CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ | 14 | CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ |
15 | EXTRA_TARGETS=@GNOME_ASKPASS@ | 15 | EXTRA_TARGETS=@GNOME_ASKPASS@ |
16 | TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) | 16 | TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS) |
@@ -13,7 +13,7 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | /* RCSID("$Id: ssh.h,v 1.17 1999/12/06 00:47:29 damien Exp $"); */ | 16 | /* RCSID("$Id: ssh.h,v 1.18 1999/12/07 03:54:53 damien Exp $"); */ |
17 | 17 | ||
18 | #ifndef SSH_H | 18 | #ifndef SSH_H |
19 | #define SSH_H | 19 | #define SSH_H |
@@ -173,7 +173,9 @@ | |||
173 | * Default path to ssh-askpass used by ssh-add, | 173 | * Default path to ssh-askpass used by ssh-add, |
174 | * environment variable for overwriting the default location | 174 | * environment variable for overwriting the default location |
175 | */ | 175 | */ |
176 | #define SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" | 176 | #ifndef SSH_ASKPASS_DEFAULT |
177 | # define SSH_ASKPASS_DEFAULT "/usr/X11R6/bin/ssh-askpass" | ||
178 | #endif | ||
177 | #define SSH_ASKPASS_ENV "SSH_ASKPASS" | 179 | #define SSH_ASKPASS_ENV "SSH_ASKPASS" |
178 | 180 | ||
179 | /* | 181 | /* |