--- loncom/lciptables	2010/10/12 10:17:10	1.3
+++ loncom/lciptables	2011/05/14 16:12:53	1.5
@@ -2,7 +2,7 @@
 #
 # The Learning Online Network with CAPA
 #
-# $Id: lciptables,v 1.3 2010/10/12 10:17:10 foxr Exp $
+# $Id: lciptables,v 1.5 2011/05/14 16:12:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,13 +88,6 @@ if (-e $tmpfile) {
     &Exit(3);
 }
 
-# --------------------------- Handle case of another lciptables process (locking)
-unless (&try_to_lock("/tmp/lock_lciptables")) {
-    print "Error. Too many other simultaneous iptables manipulation requests being ".
-        "made.\n" unless $noprint;
-    &Exit(4);
-}
-
 my $lond_port = &LONCAPA::Firewall::get_lond_port();
 
 
@@ -103,7 +96,7 @@ my $lond_port = &LONCAPA::Firewall::get_
 my @fw_chains = &LONCAPA::Firewall::get_fw_chains();
 my $iptables = &LONCAPA::Firewall::get_pathto_iptables();
 my $firewall_result = 
-     &LONCAPA::Firewall::firewall_close_port($iptables,\@fw_chains,$lond_port,[$lond_port]);
+     &LONCAPA::Firewall::firewall_close_port($iptables,\@fw_chains,$lond_port,\%iphost,[$lond_port]);
 if ($firewall_result) {
     print "$firewall_result\n";
 }
@@ -115,7 +108,6 @@ if ($firewall_result) {
 # -------------------------------------------------------- Exit script
 print "lciptables Exiting\n" unless $noprint;
 &DisableRoot;
-unlink('/tmp/lock_lciptables');
 &Exit(0);
 
 
@@ -140,42 +132,6 @@ sub DisableRoot {
     }
 }
 
-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;
-}
-
 sub Exit {
     my ($code) = @_;
     &DisableRoot();