X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/4efadaf13cabb390f063c61fd321849197595c99..736ea7721c1f97ef25572e5d84add7c7927dd752:/gen/mailhosts.gen

diff --git a/gen/mailhosts.gen b/gen/mailhosts.gen
index 892127e6..f00797cd 100755
--- a/gen/mailhosts.gen
+++ b/gen/mailhosts.gen
@@ -32,10 +32,18 @@ while (($login, $potype, $exchange_id, $imap_id, $pop_id) = $sth->fetchrow_array
     $login =~ tr/a-z/A-Z/;
 
     if ($exchange_id != 0) {
-	($mach_id) = $dbh->selectrow_array("SELECT mach_id FROM machine WHERE " .
-					   "name = 'IMAP.EXCHANGE.MIT.EDU'");
+	$imap_filesystem = lc($login) . ".po";
+	($mach_id) = $dbh->selectrow_array("SELECT mach_id FROM filesys " .
+					   "WHERE label = " . $dbh->quote($imap_filesystem) .
+					   "AND type = 'IMAP'");
 	if (defined($mach_id)) {
 	    $pop_id = $mach_id;
+	} else {
+	    ($mach_id) = $dbh->selectrow_array("SELECT mach_id FROM machine WHERE " .
+					       "name = 'IMAP.EXCHANGE.MIT.EDU'");
+	    if (defined($mach_id)) {
+		$pop_id = $mach_id;
+	    }
 	}
     }