--- loncom/build/make_domain_coordinator.pl	2006/10/08 23:05:18	1.11
+++ loncom/build/make_domain_coordinator.pl	2007/06/01 05:17:58	1.12
@@ -11,7 +11,7 @@ make_domain_coordinator.pl - Make a doma
 # The LearningOnline Network
 # make_domain_coordinator.pl - Make a domain coordinator on a system
 #
-# $Id: make_domain_coordinator.pl,v 1.11 2006/10/08 23:05:18 raeburn Exp $
+# $Id: make_domain_coordinator.pl,v 1.12 2007/06/01 05:17:58 albertel Exp $
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
 #
@@ -113,7 +113,7 @@ For example, "dcmsu" or "dcumich" would
 USERNAMEs for places like Mich State Univ, etc.
 
 The second argument specifies the domain of the computer
-coordinator and should consist of only alphanumeric characters.
+coordinator.
 
 =cut
 
@@ -128,14 +128,14 @@ if (@ARGV!=2) {
 	"\n".'USERNAMEs for places like Mich State Univ, etc.'."\n");
 }
 my ($username,$domain)=(@ARGV); shift @ARGV; shift @ARGV;
-unless ($username=~/^\w+$/ and $username!~/\_/) {
+if ($username=~/$LONCAPA::not_username_re/) {
     die('**** ERROR **** '.
-	'Username '.$username.' must consist only of alphanumeric characters'.
+	'Username '.$username.' must consist only of - . and alphanumeric characters'.
 	"\n");
 }
-unless ($domain=~/^\w+$/ and $domain!~/\_/) {
+if ($domain=~/$LONCAPA::not_domain_re/) {
     die('**** ERROR **** '.
-	'Domain '.$domain.' must consist only of alphanumeric characters'.
+	'Domain '.$domain.' must consist only of - . and alphanumeric charaters and '.
 	"\n");
 }