X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fkill.pl;h=8c8e275cbdb6c19bd801c0b1b02e4de0720bea6f;hb=eac4538f1f78b3d014539dc548fc6322e8337429;hp=0dcc0d4dd8786ea0b53849b4c770f94882b9783a;hpb=27f3508edad6ddba5628ddbb50f035e343d21f98;p=spider.git diff --git a/cmd/kill.pl b/cmd/kill.pl index 0dcc0d4d..8c8e275c 100644 --- a/cmd/kill.pl +++ b/cmd/kill.pl @@ -3,7 +3,7 @@ # # Copyright (c) 1998 Dirk Koopman G1TLH # -# $Id$ +# # use strict; @@ -66,14 +66,18 @@ while (@f) { } foreach $ref ( @refs) { - Log('msg', "Message $ref->{msgno} from $ref->{from} to $ref->{to} deleted by $call"); - if ($full) { - DXChannel::broadcast_nodes(DXProt::pc49($ref->{from}, $ref->{subject}), $main::me); + if ($ref->keep) { + push @out, $self->msg('m18', $ref->msgno); + next; } my $tonode = $ref->tonode; $ref->stop_msg($tonode) if $tonode; $ref->mark_delete($expunge ? 0 : undef); push @out, $self->msg('m12', $ref->msgno); + Log('msg', "Message $ref->{msgno} from $ref->{from} to $ref->{to} deleted by $call"); + if ($full) { + DXChannel::broadcast_nodes(DXProt::pc49($ref->{from}, $ref->{subject}), $main::me); + } } return (1, @out);