summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-12-07 14:54:53 +1100
committerDamien Miller <djm@mindrot.org>1999-12-07 14:54:53 +1100
commit3bc14dde057f5d1faee1df1d29a6520063102b77 (patch)
tree8e3801208b4211c294d5b12faaac0391a3ac1b5e
parent0c078c663312a31045b5a59196610e086bc8b4b2 (diff)
Fixed default SSH_ASKPASS
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.in2
-rw-r--r--ssh.h6
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ca28a39d..476d8630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
19991207
- sshd Redhat init script patch from Jim Knoble <jmknoble@pobox.com>
fixes compatability with 4.x and 5.x
+ - Fixed default SSH_ASKPASS
19991204
- Small cleanup of PAM code in sshd.c
diff --git a/Makefile.in b/Makefile.in
index 55b85106..c2c3261b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,7 +10,7 @@ SSH_PROGRAM=@bindir@/ssh
ASKPASS_PROGRAM=@libexecdir@/ssh/ssh-askpass
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@
EXTRA_TARGETS=@GNOME_ASKPASS@
TARGETS=libssh.a ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)
diff --git a/ssh.h b/ssh.h
index 961c82a2..0b66264f 100644
--- a/ssh.h
+++ b/ssh.h
@@ -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
#define SSH_H
@@ -173,7 +173,9 @@
* Default path to ssh-askpass used by ssh-add,
* 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"
/*