summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-01-25 23:04:22 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-01-25 23:04:22 +0000
commit27eebe6c1b9f608000188614d9a209f1281be2a2 (patch)
treeef1cfd8820cf1d4012ee845d38c6a91ceb074b35
parent87b147f539f10df7fa370b36daee54eb0896fb41 (diff)
- (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen
Petrov <roumen.petrov@skalasoft.com>
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in2
-rw-r--r--pathnames.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 74bb6881..b3768418 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 3daea429..58d67a5d 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 a660d542..223d5a2a 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