Version in base suite: 6.0.3p1-5
Version in overlay suite: 6.0.3p1-5+deb10u1

Base version: opensmtpd_6.0.3p1-5+deb10u1
Target version: opensmtpd_6.0.3p1-5+deb10u2
Base file: /srv/ftp-master.debian.org/ftp/pool/main/o/opensmtpd/opensmtpd_6.0.3p1-5+deb10u1.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/o/opensmtpd/opensmtpd_6.0.3p1-5+deb10u2.dsc

 changelog |    7 +++++++
 config    |   10 ++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff -Nru opensmtpd-6.0.3p1/debian/changelog opensmtpd-6.0.3p1/debian/changelog
--- opensmtpd-6.0.3p1/debian/changelog	2019-12-21 22:41:55.000000000 +0000
+++ opensmtpd-6.0.3p1/debian/changelog	2020-01-23 21:36:09.000000000 +0000
@@ -1,3 +1,10 @@
+opensmtpd (6.0.3p1-5+deb10u2) buster; urgency=medium
+
+  * Handle non-zero exit code from hostname during config phase
+    (Closes: #948824)
+
+ -- Ryan Kavanagh <rak@debian.org>  Thu, 23 Jan 2020 16:36:09 -0500
+
 opensmtpd (6.0.3p1-5+deb10u1) buster; urgency=medium
 
   * Warn users of change of smtpd.conf syntax (Closes: #944268)
diff -Nru opensmtpd-6.0.3p1/debian/config opensmtpd-6.0.3p1/debian/config
--- opensmtpd-6.0.3p1/debian/config	2019-12-21 20:27:41.000000000 +0000
+++ opensmtpd-6.0.3p1/debian/config	2020-01-23 21:35:55.000000000 +0000
@@ -28,12 +28,10 @@
     else
         # Otherwise, default to our FQDN
         # /etc/mailname and opensmtpd/mailname are both empty
-        # Default to the FQDN
-        MAILNAME=`hostname --fqdn 2> /dev/null`
-        # Something when wrong; resort to localdomain
-        if [ $? -ne 0 ]; then
-            MAILNAME="localdomain"
-        fi
+        # Default to the FQDN. hostname will exit with a non-zero
+        # exit code if something goes wrong, in which case we resort
+        # to the value localdomain.
+        MAILNAME=`hostname --fqdn 2> /dev/null || echo "localdomain"`
         # Update our DB with this default for when we prompt the user
         db_set opensmtpd/mailname "${MAILNAME}"
     fi