summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 74bb68812..b37684187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120010126
2 - (bal) SSH_PROGRAM vs _PATH_SSH_PROGRAM fix pointed out by Roumen
3 Petrov <roumen.petrov@skalasoft.com>
4
120010125 520010125
2 - (djm) Sync bsd-* support files: 6 - (djm) Sync bsd-* support files:
3 - deraadt@cvs.openbsd.org 2000/01/26 03:43:20 7 - 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
17 17
18CC=@CC@ 18CC=@CC@
19LD=@LD@ 19LD=@LD@
20PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" 20PATHS=-DETCDIR=\"$(sysconfdir)\" -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
21CFLAGS=@CFLAGS@ 21CFLAGS=@CFLAGS@
22CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@ 22CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@
23LIBS=@LIBS@ 23LIBS=@LIBS@
diff --git a/pathnames.h b/pathnames.h
index a660d542d..223d5a2a6 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -35,7 +35,9 @@
35#define _PATH_HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" 35#define _PATH_HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key"
36#define _PATH_DH_PRIMES ETCDIR "/primes" 36#define _PATH_DH_PRIMES ETCDIR "/primes"
37 37
38#ifndef _PATH_SSH_PROGRAM
38#define _PATH_SSH_PROGRAM "/usr/bin/ssh" 39#define _PATH_SSH_PROGRAM "/usr/bin/ssh"
40#endif
39 41
40/* 42/*
41 * The process id of the daemon listening for connections is saved here to 43 * The process id of the daemon listening for connections is saved here to