From a088cea68cf4ca19249d4cf8591e95228dba13f1 Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adamc@hcoop.net>
Date: Sat, 9 Dec 2006 19:02:47 +0000
Subject: [PATCH 1/1] Fixing little bugs during first deleuze/mire test

---
 Makefile       | 4 ++--
 src/domain.sml | 2 +-
 src/main.sml   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a4ab474..dd84ab0 100644
--- a/Makefile
+++ b/Makefile
@@ -59,10 +59,10 @@ openssl/mlton/FFI/libssl.h.mlb: openssl/openssl_sml.h
 	../openssl_sml.h
 
 %.lex.sml: %.lex
-	ml-lex $<
+	mllex $<
 
 %.grm.sig %.grm.sml: %.grm
-	ml-yacc $<
+	mlyacc $<
 
 bin/domtool-server: openssl/mlton/FFI/libssl.h.mlb \
 		src/domtool-server.mlb src/domtool.lex.sml \
diff --git a/src/domain.sml b/src/domain.sml
index f22c73b..e1099b4 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -49,7 +49,7 @@ val your_pths = ref SS.empty
 fun your_paths () = !your_pths
 
 fun setUser user =
-    (usr := Config.testUser;
+    (usr := user;
      your_doms := Acl.class {user = getUser (),
 			     class = "domain"};
      your_usrs := Acl.class {user = getUser (),
diff --git a/src/main.sml b/src/main.sml
index 9f01855..a3b78e8 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -145,7 +145,7 @@ fun request fname =
 	val user = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
 
 	val context = OpenSSL.context (Config.certDir ^ "/" ^ user ^ ".pem",
-				       Config.keyDir ^ "/" ^ user ^ ".pem",
+				       Config.keyDir ^ "/" ^ user ^ "/key.pem",
 				       Config.trustStore)
 
 	val bio = OpenSSL.connect (context, dispatcher)
@@ -248,7 +248,7 @@ fun slave () =
 	val host = hostname ()
 
 	val context = OpenSSL.context (Config.certDir ^ "/" ^ host ^ ".pem",
-				       Config.keyDir ^ "/" ^ host ^ ".pem",
+				       Config.keyDir ^ "/" ^ host ^ "/key.pem",
 				       Config.trustStore)
 
 	val sock = OpenSSL.listen (context, Config.slavePort)
-- 
2.20.1