Athena is a dirty word.

[moira.git] / gen / hesiod.pc

diff --git a/gen/hesiod.pc b/gen/hesiod.pc
index 3b9955813b637dde1b4d16e7b86e27069dd676e9..524397229bf57358662d23a46c760d6528b95746 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)
@@ -270,7 +272,15 @@ int do_passwd(void)
        }
 
       if (eid != 0)
-       pid = eid;
+       {
+         /* 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';
+         if (sqlca.sqlcode == 0)
+           pid = mid;
+         else
+           pid = eid;
+       }
 
       if (iid != 0)
        {