Fix environment calculation rule for ELocal

[hcoop/domtool2.git] / src / mail / vmail.sml

diff --git a/src/mail/vmail.sml b/src/mail/vmail.sml
index 5801cb9..60a3a35 100644 (file)
--- a/src/mail/vmail.sml
+++ b/src/mail/vmail.sml
@@ -24,7 +24,7 @@ fun rebuild () = Slave.shell [Config.Courier.postReload]
 
 datatype listing =
         Error of string
-       | Listing of string list
+       | Listing of {user : string, mailbox : string} list
 
 fun list domain =
     let
@@ -36,9 +36,18 @@ fun list domain =
                NONE => Listing (rev users)
              | SOME line =>
                case String.tokens Char.isSpace line of
-                   [addr, _] =>
+                   [addr, fields] =>
                    (case String.fields (fn ch => ch = #"@") addr of
-                        [user, _] => loop (user :: users)
+                        [user, _] =>
+                        let
+                            fun parseFields fields =
+                                case fields of
+                                    "mail" :: mailbox :: _ => loop ({user = user, mailbox = mailbox} :: users)
+                                  | _ :: _ :: rest => parseFields rest
+                                  | _ => Error "Invalid fields in database"
+                        in
+                            parseFields (String.fields (fn ch => ch = #"|" orelse ch = #"=") fields)
+                        end
                       | _ => Error "Invalid e-mail address format in database")
                  | _ => Error "Invalid entry in database"
     in
@@ -72,8 +81,8 @@ fun mailboxExists {domain, user} =
 fun add {domain, requester, user, passwd, mailbox} =
     let
        val udb = Posix.SysDB.getpwnam requester
-       val uid = Word.toInt (Posix.ProcEnv.uidToWord (Posix.SysDB.Passwd.uid udb))
-       val gid = Word.toInt (Posix.ProcEnv.gidToWord (Posix.SysDB.Passwd.gid udb))
+       val uid = SysWord.toInt (Posix.ProcEnv.uidToWord (Posix.SysDB.Passwd.uid udb))
+       val gid = SysWord.toInt (Posix.ProcEnv.gidToWord (Posix.SysDB.Passwd.gid udb))
        val home = Posix.SysDB.Passwd.home udb
     in
        if mailboxExists {domain = domain, user = user} then