diff options
| -rwxr-xr-x | adduser.local | 6 | ||||
| -rwxr-xr-x | deluser.local | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/adduser.local b/adduser.local index 1445e99..49e3ada 100755 --- a/adduser.local +++ b/adduser.local @@ -3,7 +3,7 @@ # /usr/local/sbin/adduser.local # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: adduser.local,v 1.23 2005-12-30 14:06:08 jonas Exp $ +# $Id: adduser.local,v 1.24 2006-01-12 23:38:45 jonas Exp $ # # Common adduser additions for Spiff and Xenux networks # @@ -22,7 +22,7 @@ NEWHOMEDIR=$4 fullname() { getent passwd $NEWUSERNAME | awk -F: '{print $5}' | awk -F, '{print $1}'; } maildomain() { if [ -r /etc/mailname ]; then head -n 1 /etc/mailname; fi; } -listlists() { if [ -x /usr/sbin/list_lists ]; then /usr/sbin/list_lists -ab; fi; } +listlists() { if [ -x /usr/sbin/list_lists ]; then /usr/sbin/list_lists -ab -V "$1"; fi; } add2list() { /bin/echo "$1" | /usr/sbin/add_members -w y -a y -r - "$2"; } . /etc/adduser.conf @@ -80,7 +80,7 @@ if [ -n "$maildomain" ]; then else subscriber="$NEWUSERNAME@$maildomain" fi - lists="`listlists`" + lists="`listlists "$maildomain"`" if [ -z "$lists" ]; then echo "No mailinglists found." fi diff --git a/deluser.local b/deluser.local index 5f7478b..9f5ac3c 100755 --- a/deluser.local +++ b/deluser.local @@ -3,7 +3,7 @@ # /usr/local/sbin/deluser.local # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: deluser.local,v 1.19 2006-01-12 17:22:09 jonas Exp $ +# $Id: deluser.local,v 1.20 2006-01-12 23:38:45 jonas Exp $ # # Common deluser additions for Spiff and Xenux networks # @@ -18,7 +18,7 @@ OLDHOMEDIR=$4 fullname() { getent passwd $NEWUSERNAME | awk -F: '{print $5}' | awk -F, '{print $1}'; } maildomain() { if [ -r /etc/mailname ]; then head -n 1 /etc/mailname; fi; } -listlists() { if [ -x /usr/sbin/list_lists ]; then /usr/sbin/list_lists -ab; fi; } +listlists() { if [ -x /usr/sbin/list_lists ]; then /usr/sbin/list_lists -ab -V "$1"; fi; } delfromlist() { /bin/echo "$1" | /usr/sbin/remove_members -f - "$2"; } . /etc/adduser.conf @@ -45,7 +45,7 @@ fi maildomain="`maildomain`" if [ -n "$maildomain" ]; then - lists="`listlists`" + lists="`listlists "$maildomain"`" if [ -n "$lists" ]; then echo "Unsubscribing $OLDUSERNAME@$maildomain from mailinglists..." fi |