Changes in trunk/scripts/samhainadmin.pl.in [3:1]

File:

• trunk/scripts/samhainadmin.pl.in (modified) (9 diffs)

trunk/scripts/samhainadmin.pl.in

@@ -23 +23 @@
 use Getopt::Long;
 use File::Basename;
-use File::Copy;
 use File::stat;
 use File::Temp qw/ tempfile tempdir unlink0 /;
 use IO::Handle;
-use Fcntl qw(:DEFAULT :flock);
 
 File::Temp->safe_level( File::Temp::HIGH );
@@ -38 +36 @@
 my $return_from_sign = 0;
 my $no_print_examine = 0;
-my $no_remove_lock   = 0;
 my $base = basename($0);
 
@@ -45 +42 @@
 my $daemon   = "@sbindir@/@install_name@";
 my $gpg      = "@mygpg@";
-
-$cfgfile  =~ s/^REQ_FROM_SERVER//;
-$datafile =~ s/^REQ_FROM_SERVER//;
 
 $gpg = "gpg" if ($gpg eq "");
@@ -192 +186 @@
 
     my $dir = tempdir( CLEANUP => 1 );
-    $filename = $dir . "/exa_jhfdbilw." . $$;
+    $filename = $dir . "/exa_jhfdbilw";
     open $fh, ">$filename" or die "Cannot open $filename";
     autoflush $fh 1;
@@ -287 +281 @@
     open FH, "<$file1" or die "Cannot open file $file1 for read: $!";
     if (!($file1 =~ /^\-$/)) {
-        flock(FH, LOCK_EX) unless ($no_remove_lock == 1);
         my $dir = tempdir( CLEANUP => 1 ) or die "Tempdir failed";
-        $filename = $dir . "/rem_iqegBCQb." . $$;
+        $filename = $dir . "/rem_iqegBCQb";
         open $fh, ">$filename" or die "Cannot open $filename";
         $stats = stat($file1);
@@ -320 +313 @@
     }
     if (!($file1 =~ /^\-$/)) {
-        copy("$filename", "$file1") 
-            or die "Copy $filename to $file1 failed: $!";
+        my $command = "cp $filename $file1";
+        system ($command) == 0
+            or die "system $command failed: $?";
         chmod $stats->mode, $file1;
         chown $stats->uid, $stats->gid, $file1;
-        flock(FH, LOCK_UN) unless ($no_remove_lock == 1);
-        close FH;
     }
     unlink0( $fh, $filename ) or die "Cannot unlink $filename safely";
@@ -394 +386 @@
     if ($file1 =~ /^\-$/) {
         my $dir = tempdir( CLEANUP => 1 ) or die "Tempdir failed";
-        $filename1 = $dir . "/sig_vs8827sd." . $$;
+        $filename1 = $dir . "/sig_vs8827sd";
         open $fh1, ">$filename1" or die "Cannot open $filename1";
         $flag1 = 1;
@@ -427 +419 @@
         $fileout = '-';
     } else {
-        open (LOCKFILE, "<$file1") or die "Cannot open $file1: $!";
-        flock(LOCKFILE, LOCK_EX);
         $no_print_examine = 1;
-        $no_remove_lock   = 1;
         if (examine() < 2) {
             remove();
         }
         $fileout = $file1 . ".asc";
-        $stats   = stat($file1)
-            or die "No file $file1: $!";
+        $stats   = stat($file1);
     }
 
@@ -458 +446 @@
         die ("Signed file is smaller than unsigned file") 
             unless ($st_new->size > $st_old->size);
-        move("$fileout", "$file2") 
-            or die "Move $fileout to $file2 failed: $!";
+        system ("mv $fileout $file2") == 0
+            or die "system mv $fileout $file2 failed: $?";
         chmod $stats->mode, $file2;
         chown $stats->uid, $stats->gid, $file2;
-        flock(LOCKFILE, LOCK_UN);
     }