Revised EXCHANGE behavior.

[moira.git] / gen / hesiod.pc

diff --git a/gen/hesiod.pc b/gen/hesiod.pc
index 317b0a264c43b0688d887137c8e0016e35b47949..1f4b9006eb5ae1cac0d0a015aa323f0b634490c6 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)
@@ -277,7 +279,15 @@ int do_passwd(void)
          if (sqlca.sqlcode == 0)
            pid = mid;
          else
-           pid = eid;
+           {
+             /* EXCHANGE user with no IMAP filesystem.  Give them
+              * IMAP.EXCHANGE.MIT.EDU instead of EXCHANGE.MIT.EDU.
+              */
+             EXEC SQL SELECT mach_id INTO :eid FROM machine
+               WHERE name = 'IMAP.EXCHANGE.MIT.EDU';
+             if (sqlca.sqlcode == 0)
+               pid = eid;
+           }
        }
 
       if (iid != 0)