Revised EXCHANGE behavior.

[moira.git] / gen / mailhosts.gen

diff --git a/gen/mailhosts.gen b/gen/mailhosts.gen
index 892127e69b7e487aeee08bee9e1518eac1e1ced7..f00797cd3ad75a2fb7441c6d10a8c3f1e6d4a08e 100755 (executable)
--- 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;
+           }
        }
     }