* Fix XSIish uses of 'test' in openssh-server.preinst.

2 files changed, 4 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 39199b96d..f86807ca4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openssh (1:4.1p1-7) UNRELEASED; urgency=low
   * Work around the ssh-askpass alternative somehow ending up in manual mode
     pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass.
   * Add GNU/kFreeBSD support (thanks, Aurelien Jarno; closes: #318113).
+  * Fix XSIish uses of 'test' in openssh-server.preinst.
 
  -- Colin Watson <cjwatson@debian.org>  Sat,  9 Jul 2005 23:59:38 +0100
 
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
index 1ae85c7e8..412e51564 100644
--- a/debian/openssh-server.preinst
+++ b/debian/openssh-server.preinst
@@ -3,11 +3,11 @@
 action=$1
 version=$2
 
-if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then
+if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
   version=1.2.27
 fi
 
-if [ "$action" = upgrade -o "$action" = install ]
+if [ "$action" = upgrade ] || [ "$action" = install ]
 then
   # check if debconf is missing
   if ! test -f /usr/share/debconf/confmodule
@@ -39,7 +39,7 @@ EOF
     # work around for missing debconf
     db_get() { : ; }
     RET=true
-    if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then
+    if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
       cp -a /etc/ssh-nonfree /etc/ssh
     fi
   else