--- contrib/email2htusers.pl	2001/03/05 09:46:29	1.1
+++ contrib/email2htusers.pl	2001/04/03 06:17:55	1.2
@@ -50,16 +50,16 @@
 		while ($response =~ /^2\d\d-(.+)/) {
 			my $rest=$1;
 			print "# $response\n" if ($debug);
-			if ($rest=~/[\d\. ]+([^<]+) <\\*(\w+)\@$remote>/) {
-				print "# $2:$1:auth_pop3:$2\@$remote\n";
+			if ($rest=~/[\d\. ]+([^<]+) <\\*(\w+)\@($remote[^>]*)>/) {
+				print "# $2:$1:auth_pop3:$2\@$3\n";
 			}
 			$response=<SOCK>;
 		};
 		print "# $response\n" if ($debug);
 		if ($response =~ /^2\d\d (.+)/) {
 			my $rest=$1;
-			if ($rest=~/[\d\. ]+([^<]+) <\\*(\w+)\@$remote>/) {
-				print "$2:$1:auth_pop3:$2\@$remote\n";
+			if ($rest=~/[\d\. ]+([^<]+) <\\*(\w+)\@($remote[^>]*)>/) {
+				print "$2:$1:auth_pop3:$2\@$3\n";
 			}
 		} else {
 			print "# can't add e-mail address $login\n";
@@ -68,7 +68,7 @@
 	}
 }
 
-while(<>) {
+while(<STDIN>) {
 	chomp;
 	next if (/^#/ || /^$/);
 	try_expn($_);