X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/58f4ce3bac23ceef3d84ab97144d1b4b50f27606..167cffff3b3a976d4bf454808d3054fdb323b1a1:/src/msg.sml

diff --git a/src/msg.sml b/src/msg.sml
index 22f548c..f6b0051 100644
--- a/src/msg.sml
+++ b/src/msg.sml
@@ -117,8 +117,9 @@ fun sendQuery (bio, q) =
 			   OpenSSL.writeString (bio, s))
       | QSocket s => (OpenSSL.writeInt (bio, 4);
 		      OpenSSL.writeString (bio, s))
-      | QFirewall s => (OpenSSL.writeInt (bio, 5);
-			OpenSSL.writeString (bio, s))
+      | QFirewall {node, user} => (OpenSSL.writeInt (bio, 5);
+				   OpenSSL.writeString (bio, node);
+				   OpenSSL.writeString (bio, user))
       | QAptExists s => (OpenSSL.writeInt (bio, 6);
 			 OpenSSL.writeString (bio, s))
 
@@ -131,7 +132,9 @@ fun recvQuery bio =
 	   | 2 => Option.map QFtp (OpenSSL.readString bio)
 	   | 3 => Option.map QTrustedPath (OpenSSL.readString bio)
 	   | 4 => Option.map QSocket (OpenSSL.readString bio)
-	   | 5 => Option.map QFirewall (OpenSSL.readString bio)
+	   | 5 => (case ((OpenSSL.readString bio), (OpenSSL.readString bio)) of
+		      (SOME node, SOME user) => SOME (QFirewall { node = node, user = user })
+		    | _ => NONE)
 	   | 6 => Option.map QAptExists (OpenSSL.readString bio)
 	   | _ => NONE)
       | NONE => NONE