Fix dumb message name; allow numbers and underscores in database names

[hcoop/domtool2.git] / src / msg.sml

diff --git a/src/msg.sml b/src/msg.sml
index a8aea97..61fa4bc 100644 (file)
--- a/src/msg.sml
+++ b/src/msg.sml
@@ -171,9 +171,9 @@ fun send (bio, m) =
       | MsgCreateDbUser {dbtype, passwd} => (OpenSSL.writeInt (bio, 16);
                                             OpenSSL.writeString (bio, dbtype);
                                             sendOption OpenSSL.writeString (bio, passwd))
-      | MsgCreateDbTable {dbtype, dbname} => (OpenSSL.writeInt (bio, 17);
-                                             OpenSSL.writeString (bio, dbtype);
-                                             OpenSSL.writeString (bio, dbname))
+      | MsgCreateDb {dbtype, dbname} => (OpenSSL.writeInt (bio, 17);
+                                        OpenSSL.writeString (bio, dbtype);
+                                        OpenSSL.writeString (bio, dbname))
       | MsgNewMailbox {domain, user, passwd, mailbox} =>
        (OpenSSL.writeInt (bio, 18);
         OpenSSL.writeString (bio, domain);
@@ -228,6 +228,7 @@ fun send (bio, m) =
       | MsgGrantDb {dbtype, dbname} => (OpenSSL.writeInt (bio, 37);
                                        OpenSSL.writeString (bio, dbtype);
                                        OpenSSL.writeString (bio, dbname))
+      | MsqMysqlFixperms => OpenSSL.writeInt (bio, 38)
 
 fun checkIt v =
     case v of
@@ -284,7 +285,7 @@ fun recv bio =
                              | _ => NONE)
                   | 17 => (case (OpenSSL.readString bio, OpenSSL.readString bio) of
                                (SOME dbtype, SOME dbname) =>
-                               SOME (MsgCreateDbTable {dbtype = dbtype, dbname = dbname})
+                               SOME (MsgCreateDb {dbtype = dbtype, dbname = dbname})
                              | _ => NONE)
                   | 18 => (case (OpenSSL.readString bio, OpenSSL.readString bio,
                                  OpenSSL.readString bio, OpenSSL.readString bio) of
@@ -337,6 +338,7 @@ fun recv bio =
                                (SOME dbtype, SOME dbname) =>
                                SOME (MsgGrantDb {dbtype = dbtype, dbname = dbname})
                              | _ => NONE)
+                  | 38 => SOME MsgMysqlFixperms
                   | _ => NONE)
         
 end