X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fkill.pl;h=b6d193fe48f276ac9b2b40a116c5074b6adfefa5;hb=4cc67094baaf97c4d3d47aca73e2585c36a866eb;hp=b410bc14c63c5a016233ed2ffebaf5633ba30f99;hpb=57b5e464bc44ae8eee23ab94c1f499f527595dc9;p=spider.git diff --git a/cmd/kill.pl b/cmd/kill.pl index b410bc14..b6d193fe 100644 --- a/cmd/kill.pl +++ b/cmd/kill.pl @@ -12,6 +12,7 @@ my $msgno; my @out; my @body; my $ref; +my $call = $self->call; # $DB::single = 1; @@ -21,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"; }