Diff for /loncom/lcuserdel between versions 1.5 and 1.10

version 1.5, 2000/10/29 17:57:26 version 1.10, 2000/10/30 02:31:45
Line 25  use strict; Line 25  use strict;
 # Standard input usage  # Standard input usage
 # First line is USERNAME  # First line is USERNAME
   
   # Valid user names must consist of ascii
   # characters that are alphabetical characters
   # (A-Z,a-z), numeric (0-9), or the underscore
   # mark (_). (Essentially, the perl regex \w).
   
 # Command-line arguments [USERNAME]  # Command-line arguments [USERNAME]
 # Yes, but be very careful here (don't pass shell commands)  # Yes, but be very careful here (don't pass shell commands)
 # and this is only supported to allow perl-system calls.  # and this is only supported to allow perl-system calls.
Line 35  use strict; Line 40  use strict;
 # print "uh-oh" if $exitcode;  # print "uh-oh" if $exitcode;
   
 # These are the exit codes.  # These are the exit codes.
   # ( (0,"ok"),
   #   (1,"User ID mismatch.  This program must be run as user 'www'"),
   #   (2,"Error. Too many other simultaneous password change requests being made."),
   #   (3,"Error. Only one line should be entered into standard input."),
   #   (4,"Error. This program needs just 1 command-line argument (username).") )
   
 # Security  # Security
 $ENV{'PATH'}=""; # Nullify path information.  $ENV{'PATH'}=""; # Nullify path information.
Line 75  if (@ARGV==1) { Line 85  if (@ARGV==1) {
 }  }
 elsif (@ARGV) {  elsif (@ARGV) {
     print("Error. This program needs just 1 command-line argument (username).\n") unless $noprint;      print("Error. This program needs just 1 command-line argument (username).\n") unless $noprint;
       unlink('/tmp/lock_lcpasswd');
     exit 2;      exit 2;
 }  }
 else {  else {
     @input=<>;      @input=<>;
     if (@input!=1) {      if (@input!=1) {
  print("Error. Only one line should be entered into standard input.\n") unless $noprint;   print("Error. Only one line should be entered into standard input.\n") unless $noprint;
    unlink('/tmp/lock_lcpasswd');
  exit 3;   exit 3;
     }      }
     map {chop} @input;      map {chop} @input;
Line 89  else { Line 101  else {
 my ($username)=@input;  my ($username)=@input;
 $username=~/^(\w+)$/;  $username=~/^(\w+)$/;
 my $safeusername=$1;  my $safeusername=$1;
   if ($username ne $safeusername) {
       print "Error. The user name specified has invalid characters.\n";
       unlink('/tmp/lock_lcpasswd');
       exit 9;
   }
   
 &enable_root_capability;  &enable_root_capability;
   
 # By using the system userdel command:  # By using the system userdel command:
 # Remove entry from /etc/passwd if it exists  # Remove entry from /etc/passwd if it exists
 # Remove entry from /etc/groups if it exists  # Remove entry from /etc/groups if it exists
 system('/usr/sbin/userdel',$safeusername); # ignore error message  # I surround with groupdel command to make absolutely sure the group definition disappears.
 system('/usr/sbin/groupdel',$safeusername); # ignore error message  system('/usr/sbin/groupdel 2>/dev/null',$safeusername); # ignore error message
   system('/usr/sbin/userdel 2>/dev/null',$safeusername); # ignore error message
   system('/usr/sbin/groupdel 2>/dev/null',$safeusername); # ignore error message
   
 # Remove entry from /etc/smbpasswd if it exists  # Remove entry from /etc/smbpasswd if it exists
 my $oldsmbpasswd=`/bin/cat /etc/smbpasswd`;  my $oldsmbpasswd=`/bin/cat /etc/smbpasswd`;
 my $newsmbpasswd=`/bin/grep -v '^${safeusername}:' /etc/smbpasswd`;  my $newsmbpasswd=`/bin/grep -v '^${safeusername}:' /etc/smbpasswd`;
   
 if ($oldsmbpasswd ne $newsmbpasswd) {  if ($oldsmbpasswd ne $newsmbpasswd) {
 open OUT,">/etc/smbpasswd";      open OUT,">/etc/smbpasswd";
 print OUT $newsmbpasswd;      print OUT $newsmbpasswd;
 close OUT;      close OUT;
   }
   
 # Change ownership on directory from username:username to www:www  # Change ownership on directory from username:username to www:www
 # This prevents subsequently added users from having access.  # This prevents subsequently added users from having access.

Removed from v.1.5  
changed lines
  Added in v.1.10


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