diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2002-09-04 09:57:50 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2002-09-04 09:57:50 +0000 |
| commit | d904590d8673bd33ce2b1c866db9d34f56de34e7 (patch) | |
| tree | 731a87893c9e725c94df03733d6c4349baac389e | |
| parent | 7f2211f7dbfa00d13263f2430a40aad0599ce6d0 (diff) | |
Use /etc/mailname for mailman injections in adduser.local and deluser.local.
| -rwxr-xr-x | adduser.local | 6 | ||||
| -rwxr-xr-x | deluser.local | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/adduser.local b/adduser.local index 3979f7e..66d747b 100755 --- a/adduser.local +++ b/adduser.local @@ -3,10 +3,12 @@ # /usr/local/sbin/adduser.local # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: adduser.local,v 1.9 2002-05-13 11:08:37 jonas Exp $ +# $Id: adduser.local,v 1.10 2002-09-04 09:57:50 jonas Exp $ # # Common adduser additions for Spiff and Xenux networks # +# TODO: Allow local overriding of using /etc/mailname +# set -e @@ -60,7 +62,7 @@ for list in $lists; do read subscribe case $subscribe in y|Y) - /bin/echo $NEWUSERNAME@`/bin/dnsdomainname` \ + /bin/echo $NEWUSERNAME@`cat /etc/mailname` \ | /usr/sbin/add_members -n - $list ;; esac 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 |