summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in6
-rw-r--r--contrib/ssh-copy-id2
3 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c302eef95..ffabb0510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 redhat.com, ok djm@ 4 redhat.com, ok djm@
5 - (dtucker) [regress/Makefile] Clean scp-ssh-wrapper.scp too. Patch from 5 - (dtucker) [regress/Makefile] Clean scp-ssh-wrapper.scp too. Patch from
6 vinschen at redhat.com. 6 vinschen at redhat.com.
7 - (dtucker) [Makefile.in contrib/ssh-copy-id] Bug #894: Improve portability
8 of shell constructs. Patch from cjwatson at debian.org.
7 9
820040829 1020040829
9 - (dtucker) [openbsd-compat/getrrsetbyname.c] Prevent getrrsetbyname from 11 - (dtucker) [openbsd-compat/getrrsetbyname.c] Prevent getrrsetbyname from
@@ -1714,4 +1716,4 @@
1714 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1716 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1715 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1717 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1716 1718
1717$Id: ChangeLog,v 1.3538 2004/08/30 11:13:49 dtucker Exp $ 1719$Id: ChangeLog,v 1.3539 2004/08/30 11:33:02 dtucker Exp $
diff --git a/Makefile.in b/Makefile.in
index ded7b9372..db9eb34ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.264 2004/08/29 09:52:32 dtucker Exp $ 1# $Id: Makefile.in,v 1.265 2004/08/30 11:33:02 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@
@@ -292,7 +292,7 @@ install-files: scard-install
292 else \ 292 else \
293 echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ 293 echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \
294 fi 294 fi
295 @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ 295 @if [ -f ssh_prng_cmds ] && [ ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
296 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ 296 if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
297 $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ 297 $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
298 else \ 298 else \
@@ -406,7 +406,7 @@ tests: $(TARGETS)
406 $@ 406 $@
407 407
408regressclean: 408regressclean:
409 if [ -f regress/Makefile -a -r regress/Makefile ]; then \ 409 if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \
410 (cd regress && $(MAKE) clean) \ 410 (cd regress && $(MAKE) clean) \
411 fi 411 fi
412 412
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index a1c0a9234..1555b5d37 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -24,7 +24,7 @@ else
24 fi 24 fi
25fi 25fi
26 26
27if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then 27if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then
28 GET_ID="cat ${ID_FILE}" 28 GET_ID="cat ${ID_FILE}"
29fi 29fi
30 30