--- majordomo.orig Thu Jan 13 18:29:31 2000 +++ majordomo Mon Jul 23 03:28:21 2001 @@ -64,6 +64,7 @@ require "majordomo.pl"; # all sorts of general-purpose Majordomo subs require "shlock.pl"; # NNTP-style file locking require "config_parse.pl"; # functions to parse the config files +use Digest::MD5 qw( md5_hex ); print STDERR "$0: requires succeeded. Setting defaults.\n" if $DEBUG; @@ -75,7 +76,7 @@ # Define all of the mailer properties: # It is possible that one or both of $sendmail_command and $bounce_mailer # are not defined, so we provide reasonable defaults. -$sendmail_command = "/usr/lib/sendmail" +$sendmail_command = "/usr/sbin/sendmail" unless defined $sendmail_command; $bounce_mailer = "$sendmail_command -f\$sender -t" unless defined $bounce_mailer; @@ -405,9 +406,6 @@ # making the request. # if (! $approved - && ! ((&addr_match($reply_to, $subscriber, - (&cf_ck_bool($clean_list,"mungedomain") - ? 2 : undef)))) && (($unsub_policy =~ /confirm/) && (&gen_cookie($sm, $clean_list, $subscriber) ne $auth_info))) { @@ -1907,13 +1905,7 @@ # joining that goes on, we need to ignore whitespace. $combined =~ s/\s//g; - for ($i = 0; $i < length($combined); $i++) { - $cookie ^= ord(substr($combined, $i)); - $carry = ($cookie >> 28) & 0xf; - $cookie <<= 4; - $cookie |= $carry; - } - return (sprintf("%08x", $cookie)); + return md5_hex( $combined ); }