Diff for /loncom/build/make_domain_coordinator.pl between versions 1.11 and 1.12

version 1.11, 2006/10/08 23:05:18 version 1.12, 2007/06/01 05:17:58
Line 113  For example, "dcmsu" or "dcumich" would Line 113  For example, "dcmsu" or "dcumich" would
 USERNAMEs for places like Mich State Univ, etc.  USERNAMEs for places like Mich State Univ, etc.
   
 The second argument specifies the domain of the computer  The second argument specifies the domain of the computer
 coordinator and should consist of only alphanumeric characters.  coordinator.
   
 =cut  =cut
   
Line 128  if (@ARGV!=2) { Line 128  if (@ARGV!=2) {
  "\n".'USERNAMEs for places like Mich State Univ, etc.'."\n");   "\n".'USERNAMEs for places like Mich State Univ, etc.'."\n");
 }  }
 my ($username,$domain)=(@ARGV); shift @ARGV; shift @ARGV;  my ($username,$domain)=(@ARGV); shift @ARGV; shift @ARGV;
 unless ($username=~/^\w+$/ and $username!~/\_/) {  if ($username=~/$LONCAPA::not_username_re/) {
     die('**** ERROR **** '.      die('**** ERROR **** '.
  'Username '.$username.' must consist only of alphanumeric characters'.   'Username '.$username.' must consist only of - . and alphanumeric characters'.
  "\n");   "\n");
 }  }
 unless ($domain=~/^\w+$/ and $domain!~/\_/) {  if ($domain=~/$LONCAPA::not_domain_re/) {
     die('**** ERROR **** '.      die('**** ERROR **** '.
  'Domain '.$domain.' must consist only of alphanumeric characters'.   'Domain '.$domain.' must consist only of - . and alphanumeric charaters and '.
  "\n");   "\n");
 }  }
   

Removed from v.1.11  
changed lines
  Added in v.1.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>