X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fkill.pl;h=b6d193fe48f276ac9b2b40a116c5074b6adfefa5;hb=96109dba70c32d044d653290bb3e675825c8f6ad;hp=0d787dd6faed15336a3c3e923d6236449f88e0fb;hpb=82f98b9ed11d362b2bf18f3371bb60ff02f024db;p=spider.git

diff --git a/cmd/kill.pl b/cmd/kill.pl
index 0d787dd6..b6d193fe 100644
--- a/cmd/kill.pl
+++ b/cmd/kill.pl
@@ -12,6 +12,9 @@ my $msgno;
 my @out;
 my @body;
 my $ref;
+my $call = $self->call;
+
+# $DB::single = 1;
 
 for $msgno (@f) {
   $ref = DXMsg::get($msgno);
@@ -19,10 +22,13 @@ for $msgno (@f) {
     push @out, "Msg $msgno not found";
 	next;
   }
-  if ($ref->private && $self->priv < 9 && $ref->to ne $ref->call) {
+  if ($self->priv < 5 && 
+      (($ref->private && $ref->to ne $self->call && $ref->from ne $self->call) ||
+      ($ref->private == 0  && $ref->from ne $self->call))) {
     push @out, "Msg $msgno not available";
 	next;
-  }
+  } 
+  Log('msg', "Message $ref->{msgno} from $ref->{from} to $ref->{to} deleted by $call");
   $ref->del_msg;
   push @out, "Message $msgno deleted";
 }