X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/1b1021cb38f85f638ec5b2141075e99c7b5f0fdd..fe789bea628b15229156c8a4272c2b6063c9b1a0:/src/main.sml

diff --git a/src/main.sml b/src/main.sml
index 9530bcd..67e8dc0 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -1365,18 +1365,22 @@ fun service () =
 						   SOME ("Error adding user: " ^ msg)))
 				      (fn () => ())
 
-			       | MsgCreateDb {dbtype, dbname} =>
+			       | MsgCreateDb {dbtype, dbname, encoding} =>
 				 doIt (fn () =>
 					  if Dbms.validDbname dbname then
 					      case Dbms.lookup dbtype of
 						  NONE => ("Database creation request with unknown datatype type " ^ dbtype,
 							   SOME ("Unknown database type " ^ dbtype))
 						| SOME handler =>
-						  case #createdb handler {user = user, dbname = dbname} of
-						      NONE => ("Created database " ^ user ^ "_" ^ dbname ^ ".",
-							       NONE)
-						    | SOME msg => ("Error creating database " ^ user ^ "_" ^ dbname ^ ": " ^ msg,
-								   SOME ("Error creating database: " ^ msg))
+						  if not (Dbms.validEncoding encoding) then
+						      ("Invalid encoding " ^ valOf encoding ^ " requested for database creation.",
+						       SOME "Invalid encoding")
+						  else
+						      case #createdb handler {user = user, dbname = dbname, encoding = encoding} of
+							  NONE => ("Created database " ^ user ^ "_" ^ dbname ^ ".",
+								   NONE)
+							| SOME msg => ("Error creating database " ^ user ^ "_" ^ dbname ^ ": " ^ msg,
+								       SOME ("Error creating database: " ^ msg))
 					  else
 					      ("Invalid database name " ^ user ^ "_" ^ dbname,
 					       SOME ("Invalid database name " ^ dbname)))