From b7d11402cc3fa07d9e1b5b1bd3ebd78a36a3ccd9 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 14 Jul 2007 13:16:54 +0000 Subject: Fix resolving dnsdomainname. Use /etc/local-ORG/realm, and only domainname as fallback. --- localmailtransportupdate | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'localmailtransportupdate') diff --git a/localmailtransportupdate b/localmailtransportupdate index 0df8b09..e3676b4 100755 --- a/localmailtransportupdate +++ b/localmailtransportupdate @@ -3,7 +3,7 @@ # /usr/local/sbin/localmailtransportinit # Copyright 2006 Jonas Smedegaard # -# $Id: localmailtransportupdate,v 1.8 2007-07-12 20:30:42 jonas Exp $ +# $Id: localmailtransportupdate,v 1.9 2007-07-14 13:16:54 jonas Exp $ # # Setup postfix transport map for a redpill organisation # @@ -70,9 +70,9 @@ mktransportmap() { redpilldir="/etc/local-$redpill/" realms="$(items "$redpilldir/realms")" - thisdomain="$(dnsdomainname)" + thisrealm="$(cat /etc/local-ORG/realm || dnsdomainname | tr '[a-z]' '[A-Z]')" for realm in $realms; do - [ "$thisdomain" != "$realm" ] && continue + [ "$thisrealm" = "$realm" ] && continue realmdir="$redpilldir/$realm" [ -d "$realmdir" ] || continue mailhost="$(firstitem "$realmdir/mailhost")" -- cgit v1.2.3