[BACK]Return to lcuseradd CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/Attic/lcuseradd between versions 1.4 and 1.5

version 1.4, 2000/10/29 22:38:21 version 1.5, 2000/10/29 22:50:56
Line 65  unless (&try_to_lock("/tmp/lock_lcpasswd Line 65  unless (&try_to_lock("/tmp/lock_lcpasswd
   
 # Gather input.  Should be 3 values (user name, password 1, password 2).  # Gather input.  Should be 3 values (user name, password 1, password 2).
 my @input;  my @input;
 if (@ARGV==1) {  if (@ARGV==3) {
     @input=@ARGV;      @input=@ARGV;
 }  }
 elsif (@ARGV) {  elsif (@ARGV) {
Line 75  elsif (@ARGV) { Line 75  elsif (@ARGV) {
 }  }
 else {  else {
     @input=<>;      @input=<>;
     if (@input!=1) {      if (@input!=3) {
  print("Error. Three lines should be entered into standard input.\n") unless $noprint;   print("Error. Three lines should be entered into standard input.\n") unless $noprint;
  unlink('/tmp/lock_lcpasswd');   unlink('/tmp/lock_lcpasswd');
  exit 3;   exit 3;
Line 86  else { Line 86  else {
 my ($username,$password1,$password2)=@input;  my ($username,$password1,$password2)=@input;
 $username=~/^(\w+)$/;  $username=~/^(\w+)$/;
 my $safeusername=$1;  my $safeusername=$1;
 $password1=~/^(\w+)$/;  
 my $password1=$1;  if ($password1 ne $password2) {
 $password2=~/^(\w+)$/;      print "Error. Password mismatch.\n";
 my $safepassword2=$1;      unlink('/tmp/lock_lcpasswd');
       exit 7;
   }
   
 &enable_root_capability;  &enable_root_capability;
   
 # Add user entry to /etc/passwd and /etc/groups in such  # Add user entry to /etc/passwd and /etc/groups in such
 # a way that www is a member of the user-specific group  # a way that www is a member of the user-specific group
   
 # This command 'should' make the user be a member of just  if (system('/usr/sbin/useradd','-c','LON-CAPA user',$safeusername)) {
   
 if (system('/usr/sbin/useradd','-c','LON-CAPA user','-G','www',$safeusername)) {  
     print "Error.  Something went wrong with the addition of user \"$safeusername\".\n";      print "Error.  Something went wrong with the addition of user \"$safeusername\".\n";
     unlink('/tmp/lock_lcpasswd');      unlink('/tmp/lock_lcpasswd');
     exit 5;      exit 5;
 }  }
   if (system('/usr/sbin/usermod','-G',$safeusername,'www')) {
       print "Error. Could not make www a member of the group \"$safeusername\".\n";
       unlink('/tmp/lock_lcpasswd');
       exit 6;
   }
   
   # Set password with lcpasswd-style algorithm (which creates smbpasswd entry).
   # I cannot place a direct shell call to lcpasswd since I have to allow
   # for crazy characters in the password, and the setuid environment of perl
   # requires me to make everything safe.
   
   
 # Set password with lcpasswd (which creates smbpasswd entry).  
   
   # ----------------------------------------------------------- have setuid script run as root
   sub enable_root_capability {
       if ($wwwid==$>) {
    ($<,$>)=($>,$<);
    ($(,$))=($),$();
       }
       else {
    # root capability is already enabled
       }
       return $>;
   }
   
   # ----------------------------------------------------------- have setuid script run as www
   sub disable_root_capability {
       if ($wwwid==$<) {
    ($<,$>)=($>,$<);
    ($(,$))=($),$();
       }
       else {
    # root capability is already disabled
       }
   }
   
   # ----------------------------------- make sure that another lcpasswd process isn't running
   sub try_to_lock {
       my ($lockfile)=@_;
       my $currentpid;
       my $lastpid;
       # Do not manipulate lock file as root
       if ($>==0) {
    return 0;
       }
       # Try to generate lock file.
       # Wait 3 seconds.  If same process id is in
       # lock file, then assume lock file is stale, and
       # go ahead.  If process id's fluctuate, try
       # for a maximum of 10 times.
       for (0..10) {
    if (-e $lockfile) {
       open(LOCK,"<$lockfile");
       $currentpid=<LOCK>;
       close LOCK;
       if ($currentpid==$lastpid) {
    last;
       }
       sleep 3;
       $lastpid=$currentpid;
    }
    else {
       last;
    }
    if ($_==10) {
       return 0;
    }
       }
       open(LOCK,">$lockfile");
       print LOCK $$;
       close LOCK;
       return 1;
   }
Removed from v.1.4  
changed lines
  Added in v.1.5

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