EXCHANGE changes.

[moira.git] / gen / hesiod.pc

diff --git a/gen/hesiod.pc b/gen/hesiod.pc
index 317b0a264c43b0688d887137c8e0016e35b47949..c07fa43ff1341698880d95797390a4f691735669 100644 (file)
--- a/gen/hesiod.pc
+++ b/gen/hesiod.pc
@@ -176,6 +176,8 @@ int valid(char *name)
 
   for (sawdot = 1; *name; name++)
     {
+      if (*name == '$')
+       return 0;
       if (*name == '.')
        {
          if (sawdot)
@@ -271,13 +273,13 @@ int do_passwd(void)
 
       if (eid != 0)
        {
-         /* Check for IMAP.  Can't use iid because it should be zero. */
-         EXEC SQL SELECT mach_id INTO :mid FROM filesys
-           WHERE label = :login || '.po' AND type = 'IMAP';
+         /* eid will be for EXCHANGE.MIT.EDU, but we need to convert it to
+          * IMAP.EXCHANGE.MIT.EDU.
+          */
+         EXEC SQL SELECT mach_id INTO :eid FROM machine WHERE
+           name = 'IMAP.EXCHANGE.MIT.EDU';
          if (sqlca.sqlcode == 0)
-           pid = mid;
-         else
-           pid = eid;
+             pid = eid;
        }
 
       if (iid != 0)