Diff for /loncom/lcpasswd between versions 1.13 and 1.17

version 1.13, 2001/11/15 18:34:57 version 1.17, 2002/09/16 13:27:40
Line 10 Line 10
 #  #
 # YEAR=2001  # YEAR=2001
 # 10/22,10/23,11/13,11/15 Scott Harrison  # 10/22,10/23,11/13,11/15 Scott Harrison
   # 
   # YEAR=2002
   # 02/19 Matthew Hall
 #  #
 # $Id$  # $Id$
 ###  ###
Line 44  use strict; Line 47  use strict;
 #  #
 # Standard input usage  # Standard input usage
 # First line is USERNAME  # First line is USERNAME
 # Second line is CURRENT PASSWORD  # Second line is NEW PASSWORD
 # Third line is NEW PASSWORD  # Third line is NEW PASSWORD
 #  #
 # Valid passwords must consist of the  # Valid passwords must consist of the
Line 120  if (@input!=3) { Line 123  if (@input!=3) {
     unlink('/tmp/lock_lcpasswd');      unlink('/tmp/lock_lcpasswd');
     exit 3;      exit 3;
 }  }
 map {chomp} @input;  foreach (@input) {chomp;}
   
 my ($username,$password1,$password2)=@input;  my ($username,$password1,$password2)=@input;
 $username=~/^(\w+)$/;  $username=~/^(\w+)$/;
Line 131  if (($username ne $safeusername) or ($sa Line 134  if (($username ne $safeusername) or ($sa
     exit 9;      exit 9;
 }  }
 my $pbad=0;  my $pbad=0;
 map {if (($_<32)&&($_>126)){$pbad=1;}} (split(//,$password1));  foreach (split(//,$password1)) {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}}
 map {if (($_<32)&&($_>126)){$pbad=1;}} (split(//,$password2));  foreach (split(//,$password2)) {if ((ord($_)<32)||(ord($_)>126)){$pbad=1;}}
 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 155  unless(getpwnam($safeusername)) { Line 158  unless(getpwnam($safeusername)) {
   
 &enable_root_capability;  &enable_root_capability;
 ($>,$<)=(0,0);  ($>,$<)=(0,0);
   print "Now root, -invoking pwchange with $safeusername $password1"
       unless $noprint;
 open OUT,"|pwchange $safeusername";  open OUT,"|pwchange $safeusername";
 print OUT $password1;  print OUT $password1;
 print OUT "\n";  print OUT "\n";
 close OUT;  close OUT;
 ($>,$<)=(0,500);  ($>,$<)=(0,500);
   
   print "pwchange done, back to uid 500" unless $noprint;
   
 if ($?) {  if ($?) {
     exit 8;      exit 8;
 }  }
Line 170  if (-e '/usr/bin/smbpasswd') { Line 177  if (-e '/usr/bin/smbpasswd') {
   
     ($>,$<)=(0,0); # fool smbpasswd here to think this is not a setuid      ($>,$<)=(0,0); # fool smbpasswd here to think this is not a setuid
                    # environment                     # environment
     unless (-e '/etc/smbpasswd') {  
  open (OUT,'>/etc/smbpasswd'); close OUT;  
     }  
   
     my $smbexist=0;  
     open (IN, '</etc/smbpasswd');  
     my @lines=<IN>;  
     close IN;  
     for my $l (@lines) {  
  chop $l;  
  my @F=split(/\:/,$l);  
  if ($F[0] eq $username) {$smbexist=1;}  
     }  
     unless ($smbexist) {  
  open(OUT,'>>/etc/smbpasswd');  
  print OUT join(':',($safeusername,$userid,  
     'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXX'.  
     'XXXXXXXXXXXXXXXXXX','','/home/'.$safeusername,  
     '/bin/bash')) . "\n";  
  close OUT;  
     }  
   
     open(OUT,"|/usr/bin/smbpasswd -s $safeusername>/dev/null") or  #   If the -a swithc is put on the smbpasswd
   # command line, either a new entry will be created or the old one
   # will be used. 
   # Therefore the old strategy of looking for and adding a dummy entry is 
   # not needed... Finally, the smbpasswd file is in /etc/samba not 
   # /etc/smbpasswd as older versions of the script implied.
   
       print "Running smbpasswd" unless $noprint;
       open(OUT,"|/usr/bin/smbpasswd -s -a $safeusername>/dev/null") or
  die('cannot run smbpasswd');   die('cannot run smbpasswd');
     print OUT $password2; print OUT "\n";      print OUT $password2; print OUT "\n";
     print OUT $password2; print OUT "\n";      print OUT $password2; print OUT "\n";
     close OUT;      close OUT;
     $<=$wwwid; # unfool the program      $<=$wwwid; # unfool the program
       print "smbpasswd done" unless $noprint;
 }  }
   
 &disable_root_capability;  &disable_root_capability;

Removed from v.1.13  
changed lines
  Added in v.1.17


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