Use AUTOPKGTEST_TMP rather than the deprecated ADTTMP

2 files changed, 6 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index ab75bf2a7..9ac2ca4b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,7 @@ openssh (1:8.3p1-1) UNRELEASED; urgency=medium
       yes".
     - Enable SHA2-based GSSAPI key exchange methods by default as RFC 8732
       was published.
+  * Use AUTOPKGTEST_TMP rather than the deprecated ADTTMP.
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 07 Jun 2020 10:25:54 +0100
 
diff --git a/debian/tests/regress b/debian/tests/regress
index 8bb73ee95..418bf55a6 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -2,7 +2,7 @@
 set -e
 
 if [ "$(id -un)" != openssh-tests ]; then
-        TMP="$ADTTMP/user"
+        TMP="$AUTOPKGTEST_TMP/user"
         CREATED_RUN_SSHD=false
         STARTED_HAVEGED=false
 
@@ -15,7 +15,7 @@ if [ "$(id -un)" != openssh-tests ]; then
                         else
                                 start-stop-daemon --stop --quiet \
                                         --retry=TERM/30/KILL/5 \
-                                        --pidfile "$ADTTMP/haveged.pid" \
+                                        --pidfile "$AUTOPKGTEST_TMP/haveged.pid" \
                                         --name haveged
                         fi
                 fi
@@ -54,8 +54,9 @@ EOF
                 STARTED_HAVEGED=:
         elif ! pidof haveged >/dev/null; then
                 start-stop-daemon --start --quiet \
-                        --pidfile "$ADTTMP/haveged.pid" \
-                        --exec /usr/sbin/haveged -- -p "$ADTTMP/haveged.pid"
+                        --pidfile "$AUTOPKGTEST_TMP/haveged.pid" \
+                        --exec /usr/sbin/haveged -- \
+                        -p "$AUTOPKGTEST_TMP/haveged.pid"
                 STARTED_HAVEGED=:
         fi