426
426
# ---------------------------------------------------------------------------
428
# bug 5680: 'X-Originating-IP'
432
Received: from sender.net (1.1.1.1) by receiver.net
433
with SMTP; 10 Nov 2005 00:00:00 -0000
434
X-Originating-IP: 2.2.2.2
438
Trusted: [ ip=1.1.1.1 rdns=sender.net helo=sender.net by=receiver.net ident= envfrom= intl=1 id= auth= msa=0 ]
439
Untrusted: [ ip=2.2.2.2 rdns= helo= by= ident= envfrom= intl=0 id= auth= msa=0 ]
443
# ---------------------------------------------------------------------------
445
# bug 5680: 'X-Originating-IP', trusted
448
trusted_networks 1/8 2/8
449
internal_networks 1/8
450
Received: from sender.net (1.1.1.1) by receiver.net
451
with SMTP; 10 Nov 2005 00:00:00 -0000
452
X-Originating-IP: 2.2.2.2
456
Trusted: [ ip=1.1.1.1 rdns=sender.net helo=sender.net by=receiver.net ident= envfrom= intl=1 id= auth= msa=0 ] [ ip=2.2.2.2 rdns= helo= by= ident= envfrom= intl=0 id= auth= msa=0 ]
461
# ---------------------------------------------------------------------------
463
# bug 5680: 'X-Originating-IP', msa
468
Received: from sender.net (1.1.1.1) by receiver.net
469
with SMTP; 10 Nov 2005 00:00:00 -0000
470
X-Originating-IP: 2.2.2.2
474
Trusted: [ ip=1.1.1.1 rdns=sender.net helo=sender.net by=receiver.net ident= envfrom= intl=1 id= auth= msa=1 ] [ ip=2.2.2.2 rdns= helo= by= ident= envfrom= intl=1 id= auth= msa=0 ]
479
# ---------------------------------------------------------------------------
481
# bug 5680: 'X-Originating-IP', internal
484
trusted_networks 1/8 2/8
485
internal_networks 1/8 2/8
486
Received: from sender.net (1.1.1.1) by receiver.net
487
with SMTP; 10 Nov 2005 00:00:00 -0000
488
X-Originating-IP: 2.2.2.2
492
Trusted: [ ip=1.1.1.1 rdns=sender.net helo=sender.net by=receiver.net ident= envfrom= intl=1 id= auth= msa=0 ] [ ip=2.2.2.2 rdns= helo= by= ident= envfrom= intl=1 id= auth= msa=0 ]
497
# ---------------------------------------------------------------------------
428
499
# test to make sure netset is detecting overlap correctly when using short CIDR notations
499
570
my $msg = $hdrs."\n\n[no body]\n";
500
$msg =~ s/^\s+Received: /Received: /gm;
571
$msg =~ s/^\s+(Received|X-\S+): /$1: /gm;
501
572
my $status = $sa->check_message_text ($msg);
502
573
my $result = $status->rewrite_mail();