- (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen

   Petrov <roumen.petrov@skalasoft.com>

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 74bb68812..b37684187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20010126
+ - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen 
+   Petrov <roumen.petrov@skalasoft.com>
+
 20010125
  - (djm) Sync bsd-* support files:
    - deraadt@cvs.openbsd.org 2000/01/26 03:43:20
diff --git a/Makefile.in b/Makefile.in
index 3daea429a..58d67a5d5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,7 @@ ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
 
 CC=@CC@
 LD=@LD@
-PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
+PATHS=-DETCDIR=\"$(sysconfdir)\" -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@
 LIBS=@LIBS@
diff --git a/pathnames.h b/pathnames.h
index a660d542d..223d5a2a6 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -35,7 +35,9 @@
 #define _PATH_HOST_DSA_KEY_FILE         ETCDIR "/ssh_host_dsa_key"
 #define _PATH_DH_PRIMES                 ETCDIR "/primes"
 
+#ifndef _PATH_SSH_PROGRAM
 #define _PATH_SSH_PROGRAM               "/usr/bin/ssh"
+#endif
 
 /*
  * The process id of the daemon listening for connections is saved here to