Diff for /loncom/lond between versions 1.489.2.7 and 1.489.2.8

version 1.489.2.7, 2013/08/08 18:55:22 version 1.489.2.8, 2013/08/10 14:20:52
Line 130  my @passwderrors = ("ok", Line 130  my @passwderrors = ("ok",
    "pwchange_failure - lcpasswd Error filename is invalid");     "pwchange_failure - lcpasswd Error filename is invalid");
   
   
 #  The array below are lcuseradd error strings.:  
   
 my $lastadderror = 13;  
 my @adderrors    = ("ok",  
     "User ID mismatch, lcuseradd must run as user www",  
     "lcuseradd Incorrect number of command line parameters must be 3",  
     "lcuseradd Incorrect number of stdinput lines, must be 3",  
     "lcuseradd Too many other simultaneous pwd changes in progress",  
     "lcuseradd User does not exist",  
     "lcuseradd Unable to make www member of users's group",  
     "lcuseradd Unable to su to root",  
     "lcuseradd Unable to set password",  
     "lcuseradd Username has invalid characters",  
     "lcuseradd Password has an invalid character",  
     "lcuseradd User already exists",  
     "lcuseradd Could not add user.",  
     "lcuseradd Password mismatch");  
   
   
 # This array are the errors from lcinstallfile:  # This array are the errors from lcinstallfile:
   
 my @installerrors = ("ok",  my @installerrors = ("ok",
Line 2135  sub change_authentication_handler { Line 2116  sub change_authentication_handler {
  my $passfilename = &password_path($udom, $uname);   my $passfilename = &password_path($udom, $uname);
  if ($passfilename) { # Not allowed to create a new user!!   if ($passfilename) { # Not allowed to create a new user!!
     # If just changing the unix passwd. need to arrange to run      # If just changing the unix passwd. need to arrange to run
     # passwd since otherwise make_passwd_file will run      # passwd since otherwise make_passwd_file will fail as 
     # lcuseradd which fails if an account already exists      # creation of unix authenticated users is no longer supported
     # (to prevent an unscrupulous LONCAPA admin from stealing              # except from the command line, when running make_domain_coordinator.pl
     # an existing account by overwriting it as a LonCAPA account).  
   
     if(($oldauth =~/^unix/) && ($umode eq "unix")) {      if(($oldauth =~/^unix/) && ($umode eq "unix")) {
  my $result = &change_unix_password($uname, $npass);   my $result = &change_unix_password($uname, $npass);
Line 2156  sub change_authentication_handler { Line 2136  sub change_authentication_handler {
  #  re-run manage_permissions for that role in order to be able   #  re-run manage_permissions for that role in order to be able
  #  to take ownership of the construction space back to www:www   #  to take ownership of the construction space back to www:www
  #   #
   
   
  if( (($oldauth =~ /^unix/) && ($umode eq "internal")) ||  
     (($oldauth =~ /^internal/) && ($umode eq "unix")) ) {   
     if(&is_author($udom, $uname)) {  
  &Debug(" Need to manage author permissions...");  
  &manage_permissions("/$udom/_au", $udom, $uname, "$umode:");  
     }  
  }  
  &Reply($client, \$result, $userinput);   &Reply($client, \$result, $userinput);
     }      }
                 
Line 6015  sub lcpasswdstrerror { Line 5988  sub lcpasswdstrerror {
     }      }
 }  }
   
 #  
 # Convert an error return code from lcuseradd to a string value:  
 #  
 sub lcuseraddstrerror {  
     my $ErrorCode = shift;  
     if(($ErrorCode < 0) || ($ErrorCode > $lastadderror)) {  
  return "lcuseradd - Unrecognized error code: ".$ErrorCode;  
     } else {  
  return $adderrors[$ErrorCode];  
     }  
 }  
   
 # grabs exception and records it to log before exiting  # grabs exception and records it to log before exiting
 sub catchexception {  sub catchexception {
     my ($error)=@_;      my ($error)=@_;
Line 7316  sub make_passwd_file { Line 7277  sub make_passwd_file {
     }      }
  }   }
     } elsif ($umode eq 'unix') {      } elsif ($umode eq 'unix') {
  {   &logthis(">>>Attempt to create unix account blocked -- unix auth not available for new users.");
     #   $result="no_new_unix_accounts";
     #  Don't allow the creation of privileged accounts!!! that would  
     #  be real bad!!!  
     #  
     my $uid = getpwnam($uname);  
     if((defined $uid) && ($uid == 0)) {  
  &logthis(">>>Attempt to create privileged account blocked");  
  return "no_priv_account_error\n";  
     }  
   
     my $execpath       ="$perlvar{'lonDaemons'}/"."lcuseradd";  
   
     my $lc_error_file  = $execdir."/tmp/lcuseradd".$$.".status";  
     {  
  &Debug("Executing external: ".$execpath);  
  &Debug("user  = ".$uname.", Password =". $npass);  
  my $se = IO::File->new("|$execpath > $perlvar{'lonDaemons'}/logs/lcuseradd.log");  
  print $se "$uname\n";  
                 print $se "$udom\n";  
  print $se "$npass\n";  
  print $se "$npass\n";  
  print $se "$lc_error_file\n"; # Status -> unique file.  
     }  
     if (-r $lc_error_file) {  
  &Debug("Opening error file: $lc_error_file");  
  my $error = IO::File->new("< $lc_error_file");  
  my $useraddok = <$error>;  
  $error->close;  
  unlink($lc_error_file);  
   
  chomp $useraddok;  
   
  if($useraddok > 0) {  
     my $error_text = &lcuseraddstrerror($useraddok);  
     &logthis("Failed lcuseradd: $error_text");  
     $result = "lcuseradd_failed:$error_text";  
  }  else {  
     my $pf = IO::File->new(">$passfilename");  
     if($pf) {  
  print $pf "unix:\n";  
     } else {  
  $result = "pass_file_failed_error";  
     }  
  }  
     }  else {  
  &Debug("Could not locate lcuseradd error: $lc_error_file");  
  $result="bug_lcuseradd_no_output_file";  
     }  
  }  
     } elsif ($umode eq 'none') {      } elsif ($umode eq 'none') {
  {   {
     my $pf = IO::File->new("> $passfilename");      my $pf = IO::File->new("> $passfilename");

Removed from v.1.489.2.7  
changed lines
  Added in v.1.489.2.8


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