diff options
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | contrib/ssh-copy-id | 2 | ||||
-rw-r--r-- | debian/changelog | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 919b36819..8bff3cb2d 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -290,7 +290,7 @@ install-files: scard-install | |||
290 | else \ | 290 | else \ |
291 | echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ | 291 | echo "$(DESTDIR)$(sysconfdir)/sshd_config already exists, install will not overwrite"; \ |
292 | fi | 292 | fi |
293 | @if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ | 293 | @if [ -f ssh_prng_cmds ] && [ ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \ |
294 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ | 294 | if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \ |
295 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ | 295 | $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \ |
296 | else \ | 296 | else \ |
@@ -404,6 +404,6 @@ tests: $(TARGETS) | |||
404 | $@ | 404 | $@ |
405 | 405 | ||
406 | regressclean: | 406 | regressclean: |
407 | if [ -f regress/Makefile -a -r regress/Makefile ]; then \ | 407 | if [ -f regress/Makefile ] && [ -r regress/Makefile ]; then \ |
408 | (cd regress && $(MAKE) clean) \ | 408 | (cd regress && $(MAKE) clean) \ |
409 | fi | 409 | fi |
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 |
25 | fi | 25 | fi |
26 | 26 | ||
27 | if [ -z "`eval $GET_ID`" -a -r "${ID_FILE}" ] ; then | 27 | if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then |
28 | GET_ID="cat ${ID_FILE}" | 28 | GET_ID="cat ${ID_FILE}" |
29 | fi | 29 | fi |
30 | 30 | ||
diff --git a/debian/changelog b/debian/changelog index 453116eff..40417bf6d 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -5,8 +5,8 @@ openssh (1:3.8.1p1-5) UNRELEASED; urgency=low | |||
5 | * Remove Suggests: dnsutils, as it was only needed for | 5 | * Remove Suggests: dnsutils, as it was only needed for |
6 | make-ssh-known-hosts (#93265), which has been replaced by ssh-keyscan. | 6 | make-ssh-known-hosts (#93265), which has been replaced by ssh-keyscan. |
7 | * Disable shadow password support in openssh-server-udeb. | 7 | * Disable shadow password support in openssh-server-udeb. |
8 | * Fix non-portable shell constructs in maintainer scripts (thanks, David | 8 | * Fix non-portable shell constructs in maintainer scripts, Makefile, and |
9 | Weinehall; partial fix for #258517). | 9 | ssh-copy-id (thanks, David Weinehall; closes: #258517). |
10 | * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD | 10 | * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD |
11 | handler kill the PAM thread if its waitpid() call returns 0, as well as | 11 | handler kill the PAM thread if its waitpid() call returns 0, as well as |
12 | the previous check for -1 (closes: #252676). | 12 | the previous check for -1 (closes: #252676). |