end
handle IO.Io _ => Listing []
+fun mailboxExists {domain, user} =
+ let
+ val inf = TextIO.openIn (OS.Path.joinDirFile {dir = Config.Courier.userdbDir,
+ file = domain})
+
+ fun loop () =
+ case TextIO.inputLine inf of
+ NONE => false
+ | SOME line =>
+ case String.tokens Char.isSpace line of
+ [addr, _] =>
+ (case String.fields (fn ch => ch = #"@") addr of
+ [user', _] =>
+ user' = user orelse loop ()
+ | _ => false)
+ | _ => false
+ in
+ loop ()
+ before TextIO.closeIn inf
+ end
+ handle IO.Io _ => false
+
fun add {domain, requester, user, passwd, mailbox} =
let
val udb = Posix.SysDB.getpwnam requester
val gid = Word.toInt (Posix.ProcEnv.gidToWord (Posix.SysDB.Passwd.gid udb))
val home = Posix.SysDB.Passwd.home udb
in
- if not (Slave.shell [Config.Courier.userdb, " \"", domain, "/", user, "@", domain,
+ if mailboxExists {domain = domain, user = user} then
+ SOME "Mailbox mapping already exists"
+ else if not (Slave.shell [Config.Courier.userdb, " \"", domain, "/", user, "@", domain,
"\" set home=", home, " mail=", mailbox,
" uid=", Int.toString uid, " gid=" ^ Int.toString gid]) then
SOME "Error running userdb"
end
fun passwd {domain, user, passwd} =
- let
- val proc = Unix.execute ("/bin/sh", ["-c",
- String.concat [Config.Courier.userdbpw, " | ", Config.Courier.userdb,
- " \"", domain, "/", user, "@", domain, "\" set systempw"]])
- val outf = Unix.textOutstreamOf proc
- in
- TextIO.output (outf, String.concat [passwd, "\n", passwd, "\n"]);
- TextIO.closeOut outf;
- if not (OS.Process.isSuccess (Unix.reap proc)) then
- SOME "Error setting password"
- else if not (rebuild ()) then
- SOME "Error reloading userdb"
- else
- NONE
- end
+ if not (mailboxExists {domain = domain, user = user}) then
+ SOME "Mailbox doesn't exist"
+ else let
+ val proc = Unix.execute ("/bin/sh", ["-c",
+ String.concat [Config.Courier.userdbpw, " | ", Config.Courier.userdb,
+ " \"", domain, "/", user, "@", domain, "\" set systempw"]])
+ val outf = Unix.textOutstreamOf proc
+ in
+ TextIO.output (outf, String.concat [passwd, "\n", passwd, "\n"]);
+ TextIO.closeOut outf;
+ if not (OS.Process.isSuccess (Unix.reap proc)) then
+ SOME "Error setting password"
+ else if not (rebuild ()) then
+ SOME "Error reloading userdb"
+ else
+ NONE
+ end
fun rm {domain, user} =
- if not (Slave.shell [Config.Courier.userdb, " \"", domain, "/", user, "@", domain, "\" del"]) then
+ if not (mailboxExists {domain = domain, user = user}) then
+ SOME "Mailbox doesn't exist"
+ else if not (Slave.shell [Config.Courier.userdb, " \"", domain, "/", user, "@", domain, "\" del"]) then
SOME "Error deleting password entry"
else if not (rebuild ()) then
SOME "Error reloading userdb"
passwd = passwd, mailbox = mailbox} of
NONE => ("Added mailbox " ^ emailUser ^ "@" ^ domain ^ " at " ^ mailbox,
NONE)
- | SOME msg => ("Error adding mailbox: " ^ msg,
+ | SOME msg => ("Error adding mailbox " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
SOME msg))
(fn () => ())
passwd = passwd} of
NONE => ("Changed password of mailbox " ^ emailUser ^ "@" ^ domain,
NONE)
- | SOME msg => ("Error changing mailbox password: " ^ msg,
+ | SOME msg => ("Error changing mailbox password for " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
SOME msg))
(fn () => ())
case Vmail.rm {domain = domain, user = emailUser} of
NONE => ("Deleted mailbox " ^ emailUser ^ "@" ^ domain,
NONE)
- | SOME msg => ("Error deleting mailbox: " ^ msg,
+ | SOME msg => ("Error deleting mailbox " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
SOME msg))
(fn () => ())