--- loncom/build/make_domain_coordinator.pl	2011/11/17 14:29:51	1.20
+++ loncom/build/make_domain_coordinator.pl	2021/01/08 00:38:07	1.28
@@ -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.20 2011/11/17 14:29:51 raeburn Exp $
+# $Id: make_domain_coordinator.pl,v 1.28 2021/01/08 00:38:07 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 Sys::Hostname::FQDN();
 use strict;
 
 =pod
@@ -206,10 +208,10 @@ while ((!$got_passwd) && ($trial < $maxt
               &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".
+                  &mt('Password must consist of standard ASCII characters.')."\n".
                   &mt('Please try again.')."\n");
         } else {
             $secondpass = &get_password(&mt('Enter password a second time'));
@@ -359,12 +361,23 @@ if ($pbad) {
           "\n");
 }
  
-my $distro;
+my ($distro,$nostdin);
 if (open(PIPE,"perl distprobe|")) {
     $distro = <PIPE>;
     close(PIPE);
 }
 if ($distro =~ /^ubuntu|debian/) {
+    $nostdin = 1;
+} elsif ($distro =~ /^suse([\d.]+)$/) {
+    if ($1 > 12.2) {
+        $nostdin = 1;
+    }
+} elsif ($distro =~ /^sles(\d+)$/) {
+    if ($1 > 11) {
+        $nostdin = 1;
+    }
+}
+if ($nostdin) {
     open(OUT,"|usermod -p `mkpasswd $passwd` $username");
     close(OUT);
 } else {
@@ -443,7 +456,7 @@ use GDBM_File; # A simplistic key-value
 my $rolesref=&LONCAPA::locking_hash_tie("$udpath/roles.db",&GDBM_WRCREAT());
 if (!$rolesref) {
     print(&mt('Error').' '.
-          &mt('unable to tie roles db: [_1]'."$udpath/roles.db")."\n");
+          &mt('unable to tie roles db: [_1].',"$udpath/roles.db")."\n");
     exit;
 }
 my $now = time;
@@ -476,6 +489,41 @@ $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/;
+$subdir .= "/$domconfiguser";
+
+if (-d "$dompath/$subdir") {
+    my $rolelogref = &LONCAPA::locking_hash_tie("$dompath/$subdir/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");
+} else {
+    print(&mt('Failed to log role creation as the path to the directory: "[_1]" does not exist.',"$dompath/$subdir/")."\n".
+          &mt('Please run UPDATE from the top level directory of the extracted LON-CAPA tarball, i.e., two levels up from this current directory (loncom/build).'));
+}
+
 #Update allusers MySQL table
 
 print(&mt('Adding new user to allusers table.')."\n");
@@ -492,7 +540,7 @@ by going to http://MACHINENAME/adm/creat
 
 # Output success message, and inform sysadmin about how to further proceed.
 print("\n".&mt('[_1] is now a domain coordinator',$username)."\n"); # Output success message.
-my $hostname=`hostname`; chomp($hostname); # Read in hostname.
+my $hostname = Sys::Hostname::FQDN::fqdn(); # Read in hostname.
 print("\n".
       &mt('Once LON-CAPA is running, you should log-in and use: [_1] to further define this user.',
           "\nhttp://$hostname/adm/createuser\n")."\n\n".
@@ -574,6 +622,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