X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/90dd48df1de3ea116fe2f2c0ec0fe36c71e17e5c..21d921a56a850857f6ea883c6dff6a411a659bbf:/src/msg.sml?ds=inline

diff --git a/src/msg.sml b/src/msg.sml
index 23e8ac2..53dfbfa 100644
--- a/src/msg.sml
+++ b/src/msg.sml
@@ -61,6 +61,21 @@ fun recvList f bio =
 	loop []
     end
 
+fun sendOption f (bio, opt) =
+    case opt of
+	NONE => OpenSSL.writeInt (bio, 0)
+      | SOME x => (OpenSSL.writeInt (bio, 1);
+		   f (bio, x))
+
+fun recvOption f bio =
+    case OpenSSL.readInt bio of
+	SOME 0 => SOME NONE
+      | SOME 1 =>
+	(case f bio of
+	     SOME x => SOME (SOME x)
+	   | NONE => NONE)
+      | _ => NONE
+
 fun send (bio, m) =
     case m of
 	MsgOk => OpenSSL.writeInt (bio, 1)
@@ -98,8 +113,9 @@ fun send (bio, m) =
       | MsgRegenerate => OpenSSL.writeInt (bio, 14)
       | MsgRmuser dom => (OpenSSL.writeInt (bio, 15);
 			  OpenSSL.writeString (bio, dom))
-      | MsgCreateDbUser s => (OpenSSL.writeInt (bio, 16);
-			      OpenSSL.writeString (bio, s))
+      | 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))
@@ -153,7 +169,10 @@ fun recv bio =
 		   | 13 => Option.map MsgRmdom (recvList OpenSSL.readString bio)
 		   | 14 => SOME MsgRegenerate
 		   | 15 => Option.map MsgRmuser (OpenSSL.readString bio)
-		   | 16 => Option.map MsgCreateDbUser (OpenSSL.readString bio)
+		   | 16 => (case (OpenSSL.readString bio, recvOption OpenSSL.readString bio) of
+				(SOME dbtype, SOME passwd) =>
+				SOME (MsgCreateDbUser {dbtype = dbtype, passwd = passwd})
+			      | _ => NONE)
 		   | 17 => (case (OpenSSL.readString bio, OpenSSL.readString bio) of
 				(SOME dbtype, SOME dbname) =>
 				SOME (MsgCreateDbTable {dbtype = dbtype, dbname = dbname})