--- loncom/build/make_domain_coordinator.pl	2011/03/28 21:13:41	1.18
+++ loncom/build/make_domain_coordinator.pl	2012/08/17 22:43:03	1.22
@@ -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.18 2011/03/28 21:13:41 raeburn Exp $
+# $Id: make_domain_coordinator.pl,v 1.22 2012/08/17 22:43:03 raeburn Exp $
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
 #
@@ -96,6 +96,8 @@ use Term::ReadKey;
 use Apache::lonnet;
 use Apache::lonlocal;
 use DBI;
+use Storable qw(nfreeze);
+use strict;
 
 =pod
 
@@ -122,7 +124,6 @@ coordinator.
 
 =cut
 
-my ($username,$domain)=(@ARGV);
 my $lang = &Apache::lonlocal::choose_language();
 &Apache::lonlocal::get_language_handle(undef,$lang);
 print"\n";
@@ -166,7 +167,7 @@ if (-d "/home/$username") {
     $is_user = 1;
 }
 
-if (is_user) {
+if ($is_user) {
     print(&mt('**** ERROR **** [_1] is already a linux operating system user.',
               $username)."\n\n".
           &mt('This script will only automatically generate new users.')."\n".
@@ -191,7 +192,7 @@ unless (($go_on eq '') || ($go_on =~ /^\
 }
 print "\n";
 
-my ($got_passwd,$firstpass,$secondpass);
+my ($got_passwd,$firstpass,$secondpass,$passwd);
 my $maxtries = 10;
 my $trial = 0;
 while ((!$got_passwd) && ($trial < $maxtries)) {
@@ -199,14 +200,14 @@ while ((!$got_passwd) && ($trial < $maxt
     if (length($firstpass) < 6) {
         print(&mt('Password too short.')."\n".
               &mt('Please choose a password with at least six characters.')."\n".
-i             &mt('Please try again.')."\n");
+              &mt('Please try again.')."\n");
     } elsif (length($firstpass) > 30) {
         print(&mt('Password too long.')."\n".
               &mt('Please choose a password with no more than thirty characters.')."\n".
-i             &mt('Please try again.')."\n");
+              &mt('Please try again.')."\n");
     } else {
         my $pbad=0;
-        foreach (split(//,$passwd)) {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}}
+        foreach (split(//,$firstpass)) {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}}
         if ($pbad) {
             print(&mt('Password contains invalid characters.')."\n".
                   &mt('Password must consist of standard ASCII characters')."\n".
@@ -352,7 +353,7 @@ if (-d "/home/$username") {
 
 # Process password (taint-check, then pass to the UNIX passwd command).
 $username =~ s/\W//g; # an extra filter, just to be sure
-$pbad = 0;
+my $pbad = 0;
 foreach (split(//,$passwd)) {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}}
 if ($pbad) {
     print(&mt('Password must consist of standard ASCII characters.').
@@ -476,6 +477,35 @@ $domrolesref->{$domkey}= &LONCAPA::escap
  system('/bin/chown',"www:www","$dompath/nohist_domainroles.db"); # Must be writeable by httpd process.
  system('/bin/chown',"www:www","$dompath/nohist_domainroles.db.lock");
 
+# Log with domainconfiguser in nohist_rolelog.db
+my $domconfiguser = $domain.'-domainconfig';
+my $subdir = $domconfiguser;
+$subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+
+my $rolelogref = &LONCAPA::locking_hash_tie("$dompath/$subdir/$domconfiguser/nohist_rolelog.db",&GDBM_WRCREAT());
+my $domlogkey = &LONCAPA::escape($now.'00000'.$$.'000000'); 
+my $storehash = {
+                   role    => 'dc',
+                   start   => $now,
+                   end     => 0,
+                   context => 'server',
+                };
+my $domlogvalue = {
+                    'exe_uname' => '',
+                    'exe_udom'  => $domain,
+                    'exe_time'  => $now,
+                    'exe_ip'    => '127.0.0.1',
+                    'delflag'   => '',
+                    'logentry'  => $storehash,
+                    'uname'     => $username,
+                    'udom'      => $domain,
+                 };
+$rolelogref->{$domlogkey}=&freeze_escape($domlogvalue);
+&LONCAPA::locking_hash_untie($rolelogref);
+
+ system('/bin/chown',"www:www","$dompath/$subdir/nohist_rolelog.db"); # Must be writeable by httpd process.
+ system('/bin/chown',"www:www","$dompath/$subdir/nohist_rolelog.db.lock");
+
 #Update allusers MySQL table
 
 print(&mt('Adding new user to allusers table.')."\n");
@@ -574,6 +604,15 @@ sub get_password {
     return $newpasswd;
 }
 
+sub freeze_escape {
+    my ($value)=@_;
+    if (ref($value)) {
+        $value=&nfreeze($value);
+        return '__FROZEN__'.&LONCAPA::escape($value);
+    }
+    return &LONCAPA::escape($value);
+}
+
 =pod
 
 =head1 AUTHOR