Fixed default SSH_ASKPASS

diff --git a/ChangeLog b/ChangeLog
index ca28a39df8f1f608a13ca8ff41992425ba5f529b..476d8630c24376cfb9e7c4991d87f2a67235e11f 100644 (file)
--- 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 55b85106397ff0ef4dc2fb1cb9e61969043a9b00..c2c3261b515911e2c56f6708ef6e885500d27f5d 100644 (file)
--- 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 2de5ad25e216c3f879e8b5d20aa1ac6d8f880bca..d72dcb4ead0c9e37c70c1f6d18681c7afb8c526d 100644 (file)
--- a/ssh.h
+++ b/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"
 
 /*