[BACK]Return to make_domain_coordinator.pl CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / build

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

version 1.10, 2006/08/11 20:09:02 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");
 }  }
   
Line 229  if ($< != 0) { # Am I root? Line 229  if ($< != 0) { # Am I root?
   
 =cut  =cut
   
   # ----------------------------------------------------------- /usr/sbin/groupadd
   # -- Add group
   $username=~s/\W//g; # an extra filter, just to be sure
   
   print "adding group: $username \n";
   my $status = system('/usr/sbin/groupadd', $username);
   if ($status) {
       die "Error.  Something went wrong with the addition of group ".
             "\"$username\".\n";
   }
   my $gid = getgrnam($username);
   
 # ----------------------------------------------------------- /usr/sbin/useradd  # ----------------------------------------------------------- /usr/sbin/useradd
   # -- Add user
   
 $username=~s/\W//g; # an extra filter, just to be sure  print "adding user: $username \n";
 `/usr/sbin/useradd $username`; # Add the user with the 'useradd' command.  my $status = system('/usr/sbin/useradd','-c','LON-CAPA user','-g',$gid,$username);
   if ($status) {
       system("/usr/sbin/groupdel $username");
       die "Error.  Something went wrong with the addition of user ".
             "\"$username\".\n";
   }
   
   print "Done adding user\n";
   # Make www a member of that user group.
   my $groups=`/usr/bin/groups www`;
   # untaint
   my ($safegroups)=($groups=~/:\s*([\s\w]+)/);
   $groups=$safegroups;
   chomp $groups; $groups=~s/^\S+\s+\:\s+//;
   my @grouplist=split(/\s+/,$groups);
   my @ugrouplist=grep {!/www|$username/} @grouplist;
   my $gl=join(',',(@ugrouplist,$username));
   print "Putting www in user's group\n";
   if (system('/usr/sbin/usermod','-G',$gl,'www')) {
       die "Error. Could not make www a member of the group ".
             "\"$username\".\n";
   }
   
   # Check if home directory exists for user
   # If not, create one.
   if (!-e "/home/$username") {
       if (!mkdir("/home/$username",0710)) {
           print "Error. Could not add home directory for ".
             "\"$username\".\n";
       }
   }
   
   if (-d "/home/$username") {
       system('/bin/chown',"$username:$username","/home/$username");
       system('/bin/chmod','-R','0660',"/home/$username");
       system('/bin/chmod','0710',"/home/$username");
   }
 =pod  =pod
   
 =item 3 (as root). enter in a password  =item 3 (as root). enter in a password
Removed from v.1.10  
changed lines
  Added in v.1.12

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