17,20c17,18
< # Assumes that the "approve" password for each list is the same as the
< # "approval" password used by "resend", and that this password is stored
< # in a file called ".majordomo" in the user's home directory, in the
< # following format:
---
> # Assumes that the password(s) are stored in a file named .majordomo in the
> # user's home directory, in the following format:
22c20
< # 	List		Password	Majordomo-Address
---
> # 	List		Type		Password	Majordomo-Address
23a22,24
> # Assumes that Type is either 'admin' or 'approve', indicating the type of
> # password that follows.
> #
30,31c31,33
< # 	this-list	passwd1		Majordomo@This.COM
< # 	other-list	passwd2		Majordomo@Other.GOV
---
> # 	this-list	approve		passwd1		Majordomo@This.COM
> # 	this-list	admin		passwd2		Majordomo@This.COM
> # 	other-list	approve		passwd3		Majordomo@Other.GOV
56a59,60
> #
> # Addition of Type field by Jon Parise <jon@csh.rit.edu>.
150c154
< 	    $passwd = $passwd{"$list\@$reply_to"};
---
> 	    $passwd = $passwd{"$list\@$reply_to:admin"};
196c200
<     if (!defined($passwd{$list})) {
---
>     if (!defined($passwd{"$list:approve"})) {
209c213
<     print MAIL "Approved: $passwd{$list}\n";
---
>     print MAIL "Approved: " . $passwd{"$list:approve"} . "\n";
227a232
>     local($t);
236,237c241,243
< 	$p = $_[1];				# password
< 	$m = $_[2];	$m =~ tr/A-Z/a-z/;	# majordomo@site
---
> 	$t = $_[1];	$t =~ tr/A-Z/a-z/;	# type ('admin', 'approve')
> 	$p = $_[2];				# password
> 	$m = $_[3];	$m =~ tr/A-Z/a-z/;	# majordomo@site
241,244c247,250
< 	$passwd{$l} = $p;
< 	$passwd{"$l\@$m"} = $p;
< 	$passwd{"$l\@$s"} = $p;
< 	if (defined($site{$l})) {
---
> 	$passwd{"$l:$t"} = $p;
> 	$passwd{"$l\@$m:$t"} = $p;
> 	$passwd{"$l\@$s:$t"} = $p;
> 	if (defined($site{"$l:$t"})) {
246c252
< 	    $site{$l} = "MULTIPLE";
---
> 	    $site{"$l:$t"} = "MULTIPLE";
248c254
< 	    $site{$l} = $s;
---
> 	    $site{"$l:$t"} = $s;