summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d7bf2d9d3..6fd1ec198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120060822
2 - (dtucker) [Makefile.in] Bug #1177: fix incorrect path for sshrc in
3 Makefile. Patch from santhi.amirta at gmail, ok djm.
4
120060820 520060820
2 - (dtucker) [log.c] Move ifdef to prevent unused variable warning. 6 - (dtucker) [log.c] Move ifdef to prevent unused variable warning.
3 - (dtucker) [configure.ac] Save $LIBS during PAM library tests and restore 7 - (dtucker) [configure.ac] Save $LIBS during PAM library tests and restore
@@ -5284,4 +5288,4 @@
5284 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5288 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5285 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5289 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5286 5290
5287$Id: ChangeLog,v 1.4503 2006/08/20 11:43:19 dtucker Exp $ 5291$Id: ChangeLog,v 1.4504 2006/08/22 12:24:10 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index fe510028f..e1f86dbef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.279 2006/07/24 05:30:19 djm Exp $ 1# $Id: Makefile.in,v 1.280 2006/08/22 12:24:11 dtucker Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -108,7 +108,7 @@ PATHSUBS = \
108 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ 108 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
109 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ 109 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
110 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \ 110 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
111 -e 's|/etc/sshrc|$(sysconfdir)/sshrc|g' \ 111 -e 's|/etc/ssh/sshrc|$(sysconfdir)/sshrc|g' \
112 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \ 112 -e 's|/usr/X11R6/bin/xauth|$(XAUTH_PATH)|g' \
113 -e 's|/var/empty|$(PRIVSEP_PATH)|g' \ 113 -e 's|/var/empty|$(PRIVSEP_PATH)|g' \
114 -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g' 114 -e 's|/usr/bin:/bin:/usr/sbin:/sbin|@user_path@|g'