From d904590d8673bd33ce2b1c866db9d34f56de34e7 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 4 Sep 2002 09:57:50 +0000
Subject: Use /etc/mailname for mailman injections in adduser.local and
 deluser.local.

---
 deluser.local | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'deluser.local')

diff --git a/deluser.local b/deluser.local
index 91bf2c8..77b0f2b 100755
--- a/deluser.local
+++ b/deluser.local
@@ -3,10 +3,12 @@
 # /usr/local/sbin/deluser.local
 # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: deluser.local,v 1.11 2002-04-02 07:16:39 jonas Exp $
+# $Id: deluser.local,v 1.12 2002-09-04 09:57:50 jonas Exp $
 #
 # Common deluser additions for Spiff and Xenux networks
 #
+# TODO: Allow local overriding of using /etc/mailname
+#
 
 OLDUSERNAME=$1
 OLDUID=$2
@@ -40,7 +42,7 @@ lists=""
 	lists=`find $listdir -type d -mindepth 1 -maxdepth 1 -exec basename '{}' \;`
 for list in $lists; do
 	if [ -d $listdir/$list -a -x /usr/sbin/remove_members ]; then
-		/bin/echo $OLDUSERNAME@`/bin/dnsdomainname` \
+		/bin/echo $OLDUSERNAME@`cat /etc/mailname` \
 			| /usr/sbin/remove_members -f - $list
 	fi
 done
-- 
cgit v1.2.3