From 0657ac4f115ee575f0bb7780fa9ac759c472ec97 Mon Sep 17 00:00:00 2001
From: Dennis Camera <dennis.camera@ssrq-sds-fds.ch>
Date: Mon, 1 Jun 2020 19:21:41 +0200
Subject: [PATCH] [type/__dma] Fix mailname

---
 type/__dma/gencode-remote | 31 +++++++++++++++++++++++++------
 type/__dma/manifest       | 27 +--------------------------
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/type/__dma/gencode-remote b/type/__dma/gencode-remote
index 1f252a4..4100d39 100755
--- a/type/__dma/gencode-remote
+++ b/type/__dma/gencode-remote
@@ -2,12 +2,36 @@
 
 CONF_PATH=/etc/dma  # set in Makefile
 
+# Determine mailname
+if test -f "${__object}/parameter/mailname"
+then
+	mailname=$(cat "${__object}/parameter/mailname")
+else
+	case $(cat "${__global}/explorer/os")
+	in
+		(debian|devuan|ubuntu)
+			# On Debian-like systems use /etc/mailname unless --mailname is used
+			mailname='/etc/mailname'
+			;;
+		(*)
+			mailname=$__target_fqdn
+			;;
+	esac
+fi
+
+
 # Generate config
 conf_should=$(
 	if test -s "${__object}/parameter/smart-host"
 	then
 		printf 'SMARTHOST %s\n' "$(cat "${__object}/parameter/smart-host")"
-		#printf 'AUTHPATH %s\n' "$(cat "${__type}/
+	fi
+
+	printf 'MAILNAME %s\n' "${mailname}"
+
+	if test -s "${__object}/explorer/auth_conf"
+	then
+		printf "AUTHPATH %s\n" "$(cat "${__object}/explorer/auth_conf")"
 	fi
 
 	case $(cat "${__object}/parameter/security")
@@ -68,11 +92,6 @@ conf_should=$(
 
 		echo 'NULLCLIENT'
 	fi
-
-	if test -s "${__object}/explorer/auth_conf"
-	then
-		printf "AUTHPATH %s\n" "$(cat "${__object}/explorer/auth_conf")"
-	fi
 )
 conf_should=$(echo "$conf_should" | sort -s -k 1,1)
 
diff --git a/type/__dma/manifest b/type/__dma/manifest
index 814e3ef..60038b1 100755
--- a/type/__dma/manifest
+++ b/type/__dma/manifest
@@ -1,32 +1,7 @@
 #!/bin/sh -e
 
-os=$(cat "${__global}/explorer/os")
-
-# mailname: default behaviour is different on certain systems
-if test -f "${__object}/parameter/mailname"
-then
-	mailname=$(cat "${__object}/parameter/mailname")
-else
-	# Otherwise use the hostname
-	mailname=$(cat "${__global}/explorer/hostname")
-fi
-
-case $os
-in
-	(debian|devuan|ubuntu)
-		# On Debian-like systems use /etc/mailname
-		if test -f "${__object}/parameter/mailname"
-		then
-			echo "$mailname" | __file '/etc/mailname' --state present \
-				--mode 0644 --owner root --group root --source -
-		fi
-
-		mailname='/etc/mailname'
-		;;
-esac
-
 # Install DMA
-case $os
+case $(cat "${__global}/explorer/os")
 in
 	(debian|devuan|ubuntu)
 		__package dma --state present