Diff for /loncom/Attic/lcuseradd between versions 1.8 and 1.11

version 1.8, 2000/10/30 02:31:45 version 1.11, 2000/10/30 02:57:47
Line 105  if ($username ne $safeusername) { Line 105  if ($username ne $safeusername) {
     exit 9;      exit 9;
 }  }
 my $pbad=0;  my $pbad=0;
 map {if (($_<32)&&($_>126)){$pbad=1;}} (split(//,$oldpwd));  map {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}} (split(//,$password1));
 map {if (($_<32)&&($_>126)){$pbad=1;}} (split(//,$newpwd));  map {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}} (split(//,$password2));
 if ($pbad) {  if ($pbad) {
     print "Error. A password entry had an invalid character.\n";      print "Error. A password entry had an invalid character.\n";
     unlink('/tmp/lock_lcpasswd');      unlink('/tmp/lock_lcpasswd');
Line 150  if (system('/usr/sbin/usermod','-G',$saf Line 150  if (system('/usr/sbin/usermod','-G',$saf
 # for crazy characters in the password, and the setuid environment of perl  # for crazy characters in the password, and the setuid environment of perl
 # requires me to make everything safe.  # requires me to make everything safe.
   
 my $pbad=0;  
 map {if (($_<32)&&($_>126)){$pbad=1;}} (split(//,$oldpwd));  
 map {if (($_<32)&&($_>126)){$pbad=1;}} (split(//,$newpwd));  
 if ($pbad) {  
     print "Error. A password entry had an invalid character.\n";  
     unlink('/tmp/lock_lcpasswd');  
     exit 10;  
 }  
   
 # Grab the line corresponding to username  # Grab the line corresponding to username
   open (IN, "</etc/passwd");
   @lines=<IN>;
   close IN;
 my ($userid,$useroldcryptpwd);  my ($userid,$useroldcryptpwd);
 my @F; my @U;  my @F; my @U;
 for my $l (@lines) {  for my $l (@lines) {
       chop $l;
     @F=split(/\:/,$l);      @F=split(/\:/,$l);
     if ($F[0] eq $username) {($userid,$useroldcryptpwd)=($F[2],$F[1]); @U=@F;}      if ($F[0] eq $username) {($userid,$useroldcryptpwd)=($F[2],$F[1]); @U=@F;}
 }  }
Line 174  if (!defined($userid)) { Line 169  if (!defined($userid)) {
     exit 5;      exit 5;
 }  }
   
 # Verify password entry  
 if (crypt($oldpwd,$useroldcryptpwd) ne $useroldcryptpwd) {  
     print "Error. Invalid entry of current password.\n" unless $noprint;  
     unlink('/tmp/lock_lcpasswd');  
     exit 6;  
 }  
   
 # Construct new password entry (random salt)  # Construct new password entry (random salt)
 my $newcryptpwd=crypt($newpwd,(join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]));  my $newcryptpwd=crypt($password1,(join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]));
 $U[1]=$newcryptpwd;  $U[1]=$newcryptpwd;
 my $userline=join(':',@U);  my $userline=join(':',@U);
 my $rootid=&enable_root_capability;  my $rootid=&enable_root_capability;
Line 218  unless ($smbexist) { Line 206  unless ($smbexist) {
     close OUT;      close OUT;
 }  }
 open(OUT,"|/usr/bin/smbpasswd -s $safeusername>/dev/null");  open(OUT,"|/usr/bin/smbpasswd -s $safeusername>/dev/null");
 print OUT $newpwd; print OUT "\n";  print OUT $password1; print OUT "\n";
 print OUT $newpwd; print OUT "\n";  print OUT $password1; print OUT "\n";
 close OUT;  close OUT;
 $<=$wwwid; # unfool the program  $<=$wwwid; # unfool the program
   
 # Make final modifications to the user directory.  # Make final modifications to the user directory.
 # Add a public_html file with a stand-in index.html file.  # Add a public_html file with a stand-in index.html file.
   
   system('/bin/chmod','-R','0640',"/home/$safeusername");
   system('/bin/chmod','0750',"/home/$safeusername");
 mkdir "/home/$safeusername/public_html",0750;  mkdir "/home/$safeusername/public_html",0750;
 # chmod -R  open OUT,">/home/$safeusername/public_html/index.html";
 open OUT,">/home/$safeusername/public_html";  
 print OUT<<END;  print OUT<<END;
 <HTML>  <HTML>
 <HEAD>  <HEAD>
Line 251  This area provides for: Line 240  This area provides for:
 </HTML>  </HTML>
 END  END
 close OUT;  close OUT;
   system('/bin/chown','-R',"$safeusername:$safeusername","/home/$safeusername");
 &disable_root_capability;  &disable_root_capability;
 unlink('/tmp/lock_lcpasswd');  unlink('/tmp/lock_lcpasswd');
 exit 0;  exit 0;

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


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