HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix dumb message name; allow numbers and underscores in database names
[hcoop/domtool2.git]
/
src
/
main.sml
diff --git
a/src/main.sml
b/src/main.sml
index
8bec641
..
660c892
100644
(file)
--- a/
src/main.sml
+++ b/
src/main.sml
@@
-524,7
+524,7
@@
fun requestDbTable p =
let
val (user, bio) = requestBio (fn () => ())
in
let
val (user, bio) = requestBio (fn () => ())
in
- Msg.send (bio, MsgCreateDb
Table
p);
+ Msg.send (bio, MsgCreateDb p);
case Msg.recv bio of
NONE => print "Server closed connection unexpectedly.\n"
| SOME m =>
case Msg.recv bio of
NONE => print "Server closed connection unexpectedly.\n"
| SOME m =>
@@
-576,7
+576,7
@@
fun requestListMailboxes domain =
case m of
MsgMailboxes users => (Msg.send (bio, MsgOk);
Vmail.Listing users)
case m of
MsgMailboxes users => (Msg.send (bio, MsgOk);
Vmail.Listing users)
- | MsgError s => Vmail.Error ("
Creation
failed: " ^ s)
+ | MsgError s => Vmail.Error ("
Listing
failed: " ^ s)
| _ => Vmail.Error "Unexpected server reply.")
before OpenSSL.close bio
end
| _ => Vmail.Error "Unexpected server reply.")
before OpenSSL.close bio
end
@@
-939,7
+939,9
@@
fun regenerate context =
else
()
end
else
()
end
- handle IO.Io _ => ()
+ handle IO.Io {name, function, ...} =>
+ (print ("IO error processing user " ^ user ^ ": " ^ function ^ ": " ^ name ^ "\n");
+ ok := false)
| OS.SysErr (s, _) => (print ("System error processing user " ^ user ^ ": " ^ s ^ "\n");
ok := false)
| ErrorMsg.Error => (ErrorMsg.reset ();
| OS.SysErr (s, _) => (print ("System error processing user " ^ user ^ ": " ^ s ^ "\n");
ok := false)
| ErrorMsg.Error => (ErrorMsg.reset ();
@@
-1283,7
+1285,7
@@
fun service () =
SOME ("Error adding user: " ^ msg)))
(fn () => ())
SOME ("Error adding user: " ^ msg)))
(fn () => ())
- | MsgCreateDb
Table
{dbtype, dbname} =>
+ | MsgCreateDb {dbtype, dbname} =>
doIt (fn () =>
if Dbms.validDbname dbname then
case Dbms.lookup dbtype of
doIt (fn () =>
if Dbms.validDbname dbname then
case Dbms.lookup dbtype of