===========================================================
.___ __ __
_________________ __ __ __| _/|__|/ |_
/ ___\_` __ \__ \ | | \/ __ | | \\_ __\
/ /_/ > | \// __ \| | / /_/ | | || |
\___ /|__| (____ /____/\____ | |__||__|
/_____/ \/ \/
grep rough audit - static analysis tool
v2.8 written by @Wireghoul
=================================[justanotherhacker.com]===
amavisd-new-2.11.1/README_FILES/README.sql-213- ALTER TABLE msgs
amavisd-new-2.11.1/README_FILES/README.sql:214: ADD FOREIGN KEY (sid) REFERENCES maddr(id) ON DELETE RESTRICT;
amavisd-new-2.11.1/README_FILES/README.sql-215- ALTER TABLE msgrcpt
amavisd-new-2.11.1/README_FILES/README.sql:216: ADD FOREIGN KEY (rid) REFERENCES maddr(id) ON DELETE RESTRICT;
##############################################
amavisd-new-2.11.1/README_FILES/README.sql-mysql-86--- used as senders in wblist
amavisd-new-2.11.1/README_FILES/README.sql-mysql:87:CREATE TABLE mailaddr (
amavisd-new-2.11.1/README_FILES/README.sql-mysql-88- id int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
##############################################
amavisd-new-2.11.1/README_FILES/README.sql-mysql-189--- provide unique id for each e-mail address, avoids storing copies
amavisd-new-2.11.1/README_FILES/README.sql-mysql:190:CREATE TABLE maddr (
amavisd-new-2.11.1/README_FILES/README.sql-mysql-191- partition_tag integer DEFAULT 0, -- see $partition_tag
##############################################
amavisd-new-2.11.1/README_FILES/README.sql-mysql-235- PRIMARY KEY (partition_tag,mail_id)
amavisd-new-2.11.1/README_FILES/README.sql-mysql:236:-- FOREIGN KEY (sid) REFERENCES maddr(id) ON DELETE RESTRICT
amavisd-new-2.11.1/README_FILES/README.sql-mysql-237-) ENGINE=InnoDB;
##############################################
amavisd-new-2.11.1/README_FILES/README.sql-mysql-264- PRIMARY KEY (partition_tag,mail_id,rseqnum)
amavisd-new-2.11.1/README_FILES/README.sql-mysql:265:-- FOREIGN KEY (rid) REFERENCES maddr(id) ON DELETE RESTRICT,
amavisd-new-2.11.1/README_FILES/README.sql-mysql-266--- FOREIGN KEY (mail_id) REFERENCES msgs(mail_id) ON DELETE CASCADE
##############################################
amavisd-new-2.11.1/README_FILES/README.sql-mysql-446- ALTER TABLE msgs
amavisd-new-2.11.1/README_FILES/README.sql-mysql:447: ADD FOREIGN KEY (sid) REFERENCES maddr(id) ON DELETE RESTRICT;
amavisd-new-2.11.1/README_FILES/README.sql-mysql-448- ALTER TABLE msgrcpt
amavisd-new-2.11.1/README_FILES/README.sql-mysql:449: ADD FOREIGN KEY (rid) REFERENCES maddr(id) ON DELETE RESTRICT;
amavisd-new-2.11.1/README_FILES/README.sql-mysql-450-
##############################################
amavisd-new-2.11.1/README_FILES/README.sql-pg-220--- used as senders in wblist
amavisd-new-2.11.1/README_FILES/README.sql-pg:221:CREATE TABLE mailaddr (
amavisd-new-2.11.1/README_FILES/README.sql-pg-222- id serial PRIMARY KEY,
##############################################
amavisd-new-2.11.1/README_FILES/README.sql-pg-230- rid integer NOT NULL CHECK (rid >= 0) REFERENCES users(id),
amavisd-new-2.11.1/README_FILES/README.sql-pg:231: sid integer NOT NULL CHECK (sid >= 0) REFERENCES mailaddr(id),
amavisd-new-2.11.1/README_FILES/README.sql-pg-232- wb varchar(10) NOT NULL, -- W or Y / B or N / space=neutral / score
##############################################
amavisd-new-2.11.1/README_FILES/README.sql-pg-251--- provide unique id for each e-mail address, avoids storing copies
amavisd-new-2.11.1/README_FILES/README.sql-pg:252:CREATE TABLE maddr (
amavisd-new-2.11.1/README_FILES/README.sql-pg-253- id serial PRIMARY KEY,
##############################################
amavisd-new-2.11.1/README_FILES/README.sql-pg-294- PRIMARY KEY (partition_tag,mail_id)
amavisd-new-2.11.1/README_FILES/README.sql-pg:295:--FOREIGN KEY (sid) REFERENCES maddr(id) ON DELETE RESTRICT
amavisd-new-2.11.1/README_FILES/README.sql-pg-296-);
##############################################
amavisd-new-2.11.1/README_FILES/README.sql-pg-320- PRIMARY KEY (partition_tag,mail_id,rseqnum)
amavisd-new-2.11.1/README_FILES/README.sql-pg:321:--FOREIGN KEY (rid) REFERENCES maddr(id) ON DELETE RESTRICT,
amavisd-new-2.11.1/README_FILES/README.sql-pg-322---FOREIGN KEY (mail_id) REFERENCES msgs(mail_id) ON DELETE CASCADE
##############################################
amavisd-new-2.11.1/README_FILES/README.old.scanners-79-
amavisd-new-2.11.1/README_FILES/README.old.scanners:80: $output = `$avpdc $TEMPDIR/parts`;
amavisd-new-2.11.1/README_FILES/README.old.scanners-81-
##############################################
amavisd-new-2.11.1/README_FILES/README.old.scanners-83-
amavisd-new-2.11.1/README_FILES/README.old.scanners:84: $output = `$avpdc -o{$TEMPDIR/parts/}`;
amavisd-new-2.11.1/README_FILES/README.old.scanners-85-
##############################################
amavisd-new-2.11.1/README_FILES/README.old.scanners-569-#unlink("$tmpdir/DAILYDAT.ZIP");
amavisd-new-2.11.1/README_FILES/README.old.scanners:570:$check = `$uvscandir/uvscan --version | $mailprog -s \"Virus Scan Daily DAT Updated\" $adminemail`;
amavisd-new-2.11.1/README_FILES/README.old.scanners-571-print "Daily Dat Installed!\n";
##############################################
amavisd-new-2.11.1/README_FILES/README.old.scanners-589-# Get Current Version of dat file.
amavisd-new-2.11.1/README_FILES/README.old.scanners:590:$current = `$uvscandir/uvscan --version | grep \"Virus data file\" | awk '{ print substr(\$4,2,4) }'`;
amavisd-new-2.11.1/README_FILES/README.old.scanners-591-print "Current version installed: $current";
##############################################
amavisd-new-2.11.1/README_FILES/README.old.scanners-629-
amavisd-new-2.11.1/README_FILES/README.old.scanners:630:$new = `$uvscandir/uvscan --version | grep \"Virus data file\" | awk '{ print substr(\$4,2,4) }'`;
amavisd-new-2.11.1/README_FILES/README.old.scanners-631-if($new == $current) {
##############################################
amavisd-new-2.11.1/README_FILES/README.sendmail-28-MODIFY_MAILER_FLAGS(`LOCAL',`-r')dnl
amavisd-new-2.11.1/README_FILES/README.sendmail:29:define(`LOCAL_MAILER_ARGS',`amavis $f $u --' LOCAL_MAILER_PATH `-d $u')dnl
amavisd-new-2.11.1/README_FILES/README.sendmail-30-define(`LOCAL_MAILER_PATH',`/usr/local/sbin/amavis')dnl
##############################################
amavisd-new-2.11.1/amavisd-new-courier.patch-314-+ $recip->recip_addr_smtp('<'.$addr_quoted.'>');
amavisd-new-2.11.1/amavisd-new-courier.patch:315:+ $recip->recip_addr($addr_unquoted);
amavisd-new-2.11.1/amavisd-new-courier.patch-316-+ $recip->courier_control_file($path);
##############################################
amavisd-new-2.11.1/amavisd-new-courier.patch-345-+ $self->{msginfo}->client_name($2);
amavisd-new-2.11.1/amavisd-new-courier.patch:346:+ $self->{msginfo}->client_addr($3);
amavisd-new-2.11.1/amavisd-new-courier.patch-347-+ }
##############################################
amavisd-new-2.11.1/debian/amavisd-new.amavis-mc.init-49- then
amavisd-new-2.11.1/debian/amavisd-new.amavis-mc.init:50: if [ -d /proc/`cat $PIDFILE`/ ]
amavisd-new-2.11.1/debian/amavisd-new.amavis-mc.init-51- then
##############################################
amavisd-new-2.11.1/debian/amavisd-new.amavisd-snmp-subagent.init-59- then
amavisd-new-2.11.1/debian/amavisd-new.amavisd-snmp-subagent.init:60: if [ -d /proc/`cat $PIDFILE`/ ]
amavisd-new-2.11.1/debian/amavisd-new.amavisd-snmp-subagent.init-61- then
##############################################
amavisd-new-2.11.1/debian/patches/0010-fix-882324.patch-16-
amavisd-new-2.11.1/debian/patches/0010-fix-882324.patch:17: $msginfo->client_addr($cl_ip); # ADDR
amavisd-new-2.11.1/debian/patches/0010-fix-882324.patch-18- $msginfo->client_port($cl_port); # PORT
##############################################
amavisd-new-2.11.1/debian/patches/30_conf.d_support_builtin.patch-26-+ foreach my $dir (@dirs) {
amavisd-new-2.11.1/debian/patches/30_conf.d_support_builtin.patch:27:+ push(@config_files, `run-parts --list "$dir"`);
amavisd-new-2.11.1/debian/patches/30_conf.d_support_builtin.patch-28-+ }
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-151-# replacement for a 'require' with a more informative error handling
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:152:#sub my_require($) {
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-153-# my $filename = $_[0];
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-1477- 'ins_adr' =>
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:1478: 'INSERT INTO maddr (partition_tag, email, domain) VALUES (?,?,?)',
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-1479- 'ins_msg' =>
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-2460- or die "Suspicious syslog facility name: $fac";
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:2461: my $syslog_facility_num = eval("LOG_\U$fac");
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-2462- $syslog_facility_num =~ /^\d+\z/
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-4343-# local $ENV{PATH} = '/bin:/usr/bin';
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:4344:# my(@config_files) = map { `run-parts --list "$_"` } @dirs;
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-4345-# chomp(@config_files);
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-4722-
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:4723:sub cloexec($;$$) { undef }
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:4724:# sub cloexec($;$$) { # supposedly not needed for Perl >= 5.6.0
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-4725-# my($fh,$newsetting,$name) = @_; my $flags;
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-6474-#
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:6475:sub normalize_ip_addr($) {
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-6476- my $ip = $_[0];
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-9144- my $per_recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:9145: $per_recip_obj->recip_addr($_);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-9146- $per_recip_obj->recip_addr_smtp(qquote_rfc2821_local($_));
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-11994- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:11995: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-11996- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-13500-# if ($] < 5.006) # Perl older than 5.6.0 did not set FD_CLOEXEC on sockets
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:13501:# { cloexec($_,1,$_) for @{$prop->{sock}} }
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-13502- switch_to_my_time('new request'); # timer init
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-13666- if ($sock_addr eq $peer_addr) { # common, small optimization
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:13667: $peer_addr = $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-13668- } else {
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:13669: $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:13670: $peer_addr = normalize_ip_addr($peer_addr);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-13671- }
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-13746-sub child_goes_idle($) {
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:13747: my $where = $_[0];
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-13748- do_log(5, 'child_goes_idle (%s)', $where);
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-13991- my $ip = fish_out_ip_from_received($r,$fields_ref); # possibly undef
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:13992: $ip = normalize_ip_addr($ip) if defined $ip;
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-13993- push(@trace, { ip => $ip, %$fields_ref });
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-14308- do_log(3,"client IP address unknown, fetched from Received: %s",$ip);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:14309: $msginfo->client_addr($ip); last;
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-14310- }
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-15434- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:15435: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-15436- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-17516- # copy original recipient addresses and DSN info
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:17517: $recip_obj->recip_addr($r->recip_addr);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-17518- $recip_obj->recip_addr_smtp($r->recip_addr_smtp);
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-17531- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:17532: $recip_obj->recip_addr($rec);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-17533- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($rec));
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-18638- for my $f (qw($file $altermime)) {
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:18639: my $g = $f; $g =~ s/\$/Amavis::Conf::/; my $fv_list = eval('$' . $g);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-18640- my $found = find_program_path($fv_list, $path_list_ref);
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-19752- } else { # assume port (or service) specification only, supply bind addr
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:19753: for my $bind_addr (@bind_to) { # Cartesian product: bind_addr x port
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-19754- # need brackets around an IPv6 address (as per RFC 5952, RFC 3986)
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-21592- if (exists $attr_ref->{'client_address'}) {
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:21593: $msginfo->client_addr(normalize_ip_addr($attr_ref->{'client_address'}));
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-21594- }
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-21615- my $r = $attr_ref->{'recipient'}; @recips = ();
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:21616: for my $addr (!ref($r) ? $r : @$r) {
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-21617- my $addr_quo = $addr;
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-21620- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:21621: $recip_obj->recip_addr($addr_unq);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-21622- $recip_obj->recip_addr_smtp($addr_quo);
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-22404- };
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:22405: $conn->client_ip(untaint(normalize_ip_addr($src_addr)));
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:22406: $conn->socket_ip(untaint(normalize_ip_addr($dst_addr)));
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-22407- $conn->client_port(untaint($src_port));
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-22788-
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:22789: my $cl_ip = normalize_ip_addr($xforward_args{'ADDR'});
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-22790- my $cl_port = $xforward_args{'PORT'};
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-22817-
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:22818: $msginfo->client_addr($cl_ip); # ADDR
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-22819- $msginfo->client_port($cl_port); # PORT
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-23136- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:23137: $recip_obj->recip_addr($addr);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-23138- $recip_obj->recip_addr_smtp($addr_smtp);
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-24303- if !defined $r->dsn_orcpt;
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:24304: # N.B.: change recip_addr_modified(), not recip_final_addr() !
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-24305- $r->recip_addr_modified($rcpt_addr);
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-27367- # find an existing e-mail address record for sender, or insert a new one
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:27368: ($sid,$existed) = $self->find_or_save_addr($sender_smtp,$partition_tag);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-27369- if (defined $sid) {
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-27385- if ($addr_smtp ne '') {
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:27386: ($rid,$existed) = $self->find_or_save_addr($addr_smtp,$partition_tag);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-27387- # there is perhaps 90-100% chance the recipient addr is already in the db
##############################################
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-34256- my $sdid_ace = idn_to_ascii($sig->domain);
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd:34257: for my $addr (@addr_list) {
amavisd-new-2.11.1/.pc/20_safe_path_at_init.patch/amavisd-34258- next if !defined $addr;
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-151-# replacement for a 'require' with a more informative error handling
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:152:#sub my_require($) {
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-153-# my $filename = $_[0];
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-1477- 'ins_adr' =>
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:1478: 'INSERT INTO maddr (partition_tag, email, domain) VALUES (?,?,?)',
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-1479- 'ins_msg' =>
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-2460- or die "Suspicious syslog facility name: $fac";
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:2461: my $syslog_facility_num = eval("LOG_\U$fac");
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-2462- $syslog_facility_num =~ /^\d+\z/
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-4343-# local $ENV{PATH} = '/bin:/usr/bin';
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:4344:# my(@config_files) = map { `run-parts --list "$_"` } @dirs;
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-4345-# chomp(@config_files);
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-4722-
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:4723:sub cloexec($;$$) { undef }
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:4724:# sub cloexec($;$$) { # supposedly not needed for Perl >= 5.6.0
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-4725-# my($fh,$newsetting,$name) = @_; my $flags;
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-6474-#
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:6475:sub normalize_ip_addr($) {
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-6476- my $ip = $_[0];
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-9144- my $per_recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:9145: $per_recip_obj->recip_addr($_);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-9146- $per_recip_obj->recip_addr_smtp(qquote_rfc2821_local($_));
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-11994- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:11995: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-11996- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-13500-# if ($] < 5.006) # Perl older than 5.6.0 did not set FD_CLOEXEC on sockets
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:13501:# { cloexec($_,1,$_) for @{$prop->{sock}} }
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-13502- switch_to_my_time('new request'); # timer init
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-13666- if ($sock_addr eq $peer_addr) { # common, small optimization
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:13667: $peer_addr = $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-13668- } else {
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:13669: $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:13670: $peer_addr = normalize_ip_addr($peer_addr);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-13671- }
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-13746-sub child_goes_idle($) {
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:13747: my $where = $_[0];
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-13748- do_log(5, 'child_goes_idle (%s)', $where);
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-13991- my $ip = fish_out_ip_from_received($r,$fields_ref); # possibly undef
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:13992: $ip = normalize_ip_addr($ip) if defined $ip;
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-13993- push(@trace, { ip => $ip, %$fields_ref });
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-14308- do_log(3,"client IP address unknown, fetched from Received: %s",$ip);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:14309: $msginfo->client_addr($ip); last;
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-14310- }
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-15434- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:15435: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-15436- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-17516- # copy original recipient addresses and DSN info
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:17517: $recip_obj->recip_addr($r->recip_addr);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-17518- $recip_obj->recip_addr_smtp($r->recip_addr_smtp);
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-17531- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:17532: $recip_obj->recip_addr($rec);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-17533- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($rec));
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-18638- for my $f (qw($file $altermime)) {
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:18639: my $g = $f; $g =~ s/\$/Amavis::Conf::/; my $fv_list = eval('$' . $g);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-18640- my $found = find_program_path($fv_list, $path_list_ref);
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-19756- } else { # assume port (or service) specification only, supply bind addr
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:19757: for my $bind_addr (@bind_to) { # Cartesian product: bind_addr x port
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-19758- # need brackets around an IPv6 address (as per RFC 5952, RFC 3986)
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-21596- if (exists $attr_ref->{'client_address'}) {
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:21597: $msginfo->client_addr(normalize_ip_addr($attr_ref->{'client_address'}));
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-21598- }
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-21619- my $r = $attr_ref->{'recipient'}; @recips = ();
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:21620: for my $addr (!ref($r) ? $r : @$r) {
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-21621- my $addr_quo = $addr;
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-21624- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:21625: $recip_obj->recip_addr($addr_unq);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-21626- $recip_obj->recip_addr_smtp($addr_quo);
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-22408- };
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:22409: $conn->client_ip(untaint(normalize_ip_addr($src_addr)));
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:22410: $conn->socket_ip(untaint(normalize_ip_addr($dst_addr)));
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-22411- $conn->client_port(untaint($src_port));
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-22792-
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:22793: my $cl_ip = normalize_ip_addr($xforward_args{'ADDR'});
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-22794- my $cl_port = $xforward_args{'PORT'};
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-22821-
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:22822: $msginfo->client_addr($cl_ip); # ADDR
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-22823- $msginfo->client_port($cl_port); # PORT
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-23140- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:23141: $recip_obj->recip_addr($addr);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-23142- $recip_obj->recip_addr_smtp($addr_smtp);
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-24307- if !defined $r->dsn_orcpt;
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:24308: # N.B.: change recip_addr_modified(), not recip_final_addr() !
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-24309- $r->recip_addr_modified($rcpt_addr);
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-27371- # find an existing e-mail address record for sender, or insert a new one
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:27372: ($sid,$existed) = $self->find_or_save_addr($sender_smtp,$partition_tag);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-27373- if (defined $sid) {
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-27389- if ($addr_smtp ne '') {
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:27390: ($rid,$existed) = $self->find_or_save_addr($addr_smtp,$partition_tag);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-27391- # there is perhaps 90-100% chance the recipient addr is already in the db
##############################################
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-34260- my $sdid_ace = idn_to_ascii($sig->domain);
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd:34261: for my $addr (@addr_list) {
amavisd-new-2.11.1/.pc/30_conf.d_support_builtin.patch/amavisd-34262- next if !defined $addr;
##############################################
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners-79-
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners:80: $output = `$avpdc $TEMPDIR/parts`;
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners-81-
##############################################
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners-83-
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners:84: $output = `$avpdc -o{$TEMPDIR/parts/}`;
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners-85-
##############################################
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners-569-#unlink("$tmpdir/DAILYDAT.ZIP");
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners:570:$check = `$uvscandir/uvscan --version | $mailprog -s \"Virus Scan Daily DAT Updated\" $adminemail`;
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners-571-print "Daily Dat Installed!\n";
##############################################
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners-589-# Get Current Version of dat file.
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners:590:$current = `$uvscandir/uvscan --version | grep \"Virus data file\" | awk '{ print substr(\$4,2,4) }'`;
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners-591-print "Current version installed: $current";
##############################################
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners-629-
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners:630:$new = `$uvscandir/uvscan --version | grep \"Virus data file\" | awk '{ print substr(\$4,2,4) }'`;
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.old.scanners-631-if($new == $current) {
##############################################
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.sendmail-28-MODIFY_MAILER_FLAGS(`LOCAL',`-r')dnl
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.sendmail:29:define(`LOCAL_MAILER_ARGS',`amavis $f $u --' LOCAL_MAILER_PATH `-d $u')dnl
amavisd-new-2.11.1/.pc/40_fix_paths.patch/README_FILES/README.sendmail-30-define(`LOCAL_MAILER_PATH',`/usr/local/sbin/amavis')dnl
##############################################
amavisd-new-2.11.1/.pc/45_misc_doc_changes.patch/amavisd.conf-default-572-# 'ins_adr' =>
amavisd-new-2.11.1/.pc/45_misc_doc_changes.patch/amavisd.conf-default:573:# 'INSERT INTO maddr (partition_tag, email, domain) VALUES (?,?,?)',
amavisd-new-2.11.1/.pc/45_misc_doc_changes.patch/amavisd.conf-default-574-# 'ins_msg' =>
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-151-# replacement for a 'require' with a more informative error handling
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:152:#sub my_require($) {
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-153-# my $filename = $_[0];
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-1477- 'ins_adr' =>
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:1478: 'INSERT INTO maddr (partition_tag, email, domain) VALUES (?,?,?)',
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-1479- 'ins_msg' =>
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-2460- or die "Suspicious syslog facility name: $fac";
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:2461: my $syslog_facility_num = eval("LOG_\U$fac");
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-2462- $syslog_facility_num =~ /^\d+\z/
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-4343-# local $ENV{PATH} = '/bin:/usr/bin';
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:4344:# my(@config_files) = map { `run-parts --list "$_"` } @dirs;
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-4345-# chomp(@config_files);
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-4358- foreach my $dir (@dirs) {
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:4359: push(@config_files, `run-parts --list "$dir"`);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-4360- }
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-4741-
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:4742:sub cloexec($;$$) { undef }
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:4743:# sub cloexec($;$$) { # supposedly not needed for Perl >= 5.6.0
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-4744-# my($fh,$newsetting,$name) = @_; my $flags;
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-6493-#
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:6494:sub normalize_ip_addr($) {
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-6495- my $ip = $_[0];
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-9163- my $per_recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:9164: $per_recip_obj->recip_addr($_);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-9165- $per_recip_obj->recip_addr_smtp(qquote_rfc2821_local($_));
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-12013- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:12014: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-12015- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-13519-# if ($] < 5.006) # Perl older than 5.6.0 did not set FD_CLOEXEC on sockets
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:13520:# { cloexec($_,1,$_) for @{$prop->{sock}} }
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-13521- switch_to_my_time('new request'); # timer init
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-13685- if ($sock_addr eq $peer_addr) { # common, small optimization
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:13686: $peer_addr = $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-13687- } else {
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:13688: $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:13689: $peer_addr = normalize_ip_addr($peer_addr);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-13690- }
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-13765-sub child_goes_idle($) {
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:13766: my $where = $_[0];
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-13767- do_log(5, 'child_goes_idle (%s)', $where);
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-14010- my $ip = fish_out_ip_from_received($r,$fields_ref); # possibly undef
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:14011: $ip = normalize_ip_addr($ip) if defined $ip;
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-14012- push(@trace, { ip => $ip, %$fields_ref });
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-14327- do_log(3,"client IP address unknown, fetched from Received: %s",$ip);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:14328: $msginfo->client_addr($ip); last;
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-14329- }
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-15453- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:15454: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-15455- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-17535- # copy original recipient addresses and DSN info
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:17536: $recip_obj->recip_addr($r->recip_addr);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-17537- $recip_obj->recip_addr_smtp($r->recip_addr_smtp);
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-17550- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:17551: $recip_obj->recip_addr($rec);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-17552- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($rec));
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-18657- for my $f (qw($file $altermime)) {
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:18658: my $g = $f; $g =~ s/\$/Amavis::Conf::/; my $fv_list = eval('$' . $g);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-18659- my $found = find_program_path($fv_list, $path_list_ref);
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-19774- } else { # assume port (or service) specification only, supply bind addr
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:19775: for my $bind_addr (@bind_to) { # Cartesian product: bind_addr x port
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-19776- # need brackets around an IPv6 address (as per RFC 5952, RFC 3986)
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-21614- if (exists $attr_ref->{'client_address'}) {
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:21615: $msginfo->client_addr(normalize_ip_addr($attr_ref->{'client_address'}));
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-21616- }
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-21637- my $r = $attr_ref->{'recipient'}; @recips = ();
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:21638: for my $addr (!ref($r) ? $r : @$r) {
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-21639- my $addr_quo = $addr;
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-21642- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:21643: $recip_obj->recip_addr($addr_unq);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-21644- $recip_obj->recip_addr_smtp($addr_quo);
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-22426- };
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:22427: $conn->client_ip(untaint(normalize_ip_addr($src_addr)));
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:22428: $conn->socket_ip(untaint(normalize_ip_addr($dst_addr)));
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-22429- $conn->client_port(untaint($src_port));
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-22810-
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:22811: my $cl_ip = normalize_ip_addr($xforward_args{'ADDR'});
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-22812- my $cl_port = $xforward_args{'PORT'};
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-22839-
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:22840: $msginfo->client_addr($cl_ip); # ADDR
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-22841- $msginfo->client_port($cl_port); # PORT
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-23158- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:23159: $recip_obj->recip_addr($addr);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-23160- $recip_obj->recip_addr_smtp($addr_smtp);
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-24325- if !defined $r->dsn_orcpt;
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:24326: # N.B.: change recip_addr_modified(), not recip_final_addr() !
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-24327- $r->recip_addr_modified($rcpt_addr);
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-27389- # find an existing e-mail address record for sender, or insert a new one
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:27390: ($sid,$existed) = $self->find_or_save_addr($sender_smtp,$partition_tag);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-27391- if (defined $sid) {
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-27407- if ($addr_smtp ne '') {
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:27408: ($rid,$existed) = $self->find_or_save_addr($addr_smtp,$partition_tag);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-27409- # there is perhaps 90-100% chance the recipient addr is already in the db
##############################################
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-34278- my $sdid_ace = idn_to_ascii($sig->domain);
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd:34279: for my $addr (@addr_list) {
amavisd-new-2.11.1/.pc/85-clarify_fqdn_error.patch/amavisd-34280- next if !defined $addr;
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-151-# replacement for a 'require' with a more informative error handling
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:152:#sub my_require($) {
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-153-# my $filename = $_[0];
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-1477- 'ins_adr' =>
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:1478: 'INSERT INTO maddr (partition_tag, email, domain) VALUES (?,?,?)',
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-1479- 'ins_msg' =>
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-2460- or die "Suspicious syslog facility name: $fac";
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:2461: my $syslog_facility_num = eval("LOG_\U$fac");
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-2462- $syslog_facility_num =~ /^\d+\z/
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-4343-# local $ENV{PATH} = '/bin:/usr/bin';
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:4344:# my(@config_files) = map { `run-parts --list "$_"` } @dirs;
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-4345-# chomp(@config_files);
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-4358- foreach my $dir (@dirs) {
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:4359: push(@config_files, `run-parts --list "$dir"`);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-4360- }
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-4741-
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:4742:sub cloexec($;$$) { undef }
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:4743:# sub cloexec($;$$) { # supposedly not needed for Perl >= 5.6.0
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-4744-# my($fh,$newsetting,$name) = @_; my $flags;
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-6493-#
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:6494:sub normalize_ip_addr($) {
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-6495- my $ip = $_[0];
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-9163- my $per_recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:9164: $per_recip_obj->recip_addr($_);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-9165- $per_recip_obj->recip_addr_smtp(qquote_rfc2821_local($_));
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-12013- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:12014: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-12015- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-13519-# if ($] < 5.006) # Perl older than 5.6.0 did not set FD_CLOEXEC on sockets
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:13520:# { cloexec($_,1,$_) for @{$prop->{sock}} }
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-13521- switch_to_my_time('new request'); # timer init
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-13685- if ($sock_addr eq $peer_addr) { # common, small optimization
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:13686: $peer_addr = $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-13687- } else {
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:13688: $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:13689: $peer_addr = normalize_ip_addr($peer_addr);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-13690- }
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-13765-sub child_goes_idle($) {
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:13766: my $where = $_[0];
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-13767- do_log(5, 'child_goes_idle (%s)', $where);
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-14010- my $ip = fish_out_ip_from_received($r,$fields_ref); # possibly undef
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:14011: $ip = normalize_ip_addr($ip) if defined $ip;
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-14012- push(@trace, { ip => $ip, %$fields_ref });
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-14327- do_log(3,"client IP address unknown, fetched from Received: %s",$ip);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:14328: $msginfo->client_addr($ip); last;
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-14329- }
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-15453- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:15454: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-15455- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-17535- # copy original recipient addresses and DSN info
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:17536: $recip_obj->recip_addr($r->recip_addr);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-17537- $recip_obj->recip_addr_smtp($r->recip_addr_smtp);
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-17550- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:17551: $recip_obj->recip_addr($rec);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-17552- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($rec));
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-18657- for my $f (qw($file $altermime)) {
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:18658: my $g = $f; $g =~ s/\$/Amavis::Conf::/; my $fv_list = eval('$' . $g);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-18659- my $found = find_program_path($fv_list, $path_list_ref);
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-19775- } else { # assume port (or service) specification only, supply bind addr
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:19776: for my $bind_addr (@bind_to) { # Cartesian product: bind_addr x port
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-19777- # need brackets around an IPv6 address (as per RFC 5952, RFC 3986)
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-21615- if (exists $attr_ref->{'client_address'}) {
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:21616: $msginfo->client_addr(normalize_ip_addr($attr_ref->{'client_address'}));
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-21617- }
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-21638- my $r = $attr_ref->{'recipient'}; @recips = ();
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:21639: for my $addr (!ref($r) ? $r : @$r) {
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-21640- my $addr_quo = $addr;
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-21643- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:21644: $recip_obj->recip_addr($addr_unq);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-21645- $recip_obj->recip_addr_smtp($addr_quo);
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-22427- };
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:22428: $conn->client_ip(untaint(normalize_ip_addr($src_addr)));
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:22429: $conn->socket_ip(untaint(normalize_ip_addr($dst_addr)));
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-22430- $conn->client_port(untaint($src_port));
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-22811-
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:22812: my $cl_ip = normalize_ip_addr($xforward_args{'ADDR'});
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-22813- my $cl_port = $xforward_args{'PORT'};
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-22840-
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:22841: $msginfo->client_addr($cl_ip); # ADDR
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-22842- $msginfo->client_port($cl_port); # PORT
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-23159- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:23160: $recip_obj->recip_addr($addr);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-23161- $recip_obj->recip_addr_smtp($addr_smtp);
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-24326- if !defined $r->dsn_orcpt;
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:24327: # N.B.: change recip_addr_modified(), not recip_final_addr() !
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-24328- $r->recip_addr_modified($rcpt_addr);
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-27390- # find an existing e-mail address record for sender, or insert a new one
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:27391: ($sid,$existed) = $self->find_or_save_addr($sender_smtp,$partition_tag);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-27392- if (defined $sid) {
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-27408- if ($addr_smtp ne '') {
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:27409: ($rid,$existed) = $self->find_or_save_addr($addr_smtp,$partition_tag);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-27410- # there is perhaps 90-100% chance the recipient addr is already in the db
##############################################
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-34279- my $sdid_ace = idn_to_ascii($sig->domain);
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd:34280: for my $addr (@addr_list) {
amavisd-new-2.11.1/.pc/0009-Fix-an-unescaped-brace-in-amavisd.patch/amavisd-34281- next if !defined $addr;
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-151-# replacement for a 'require' with a more informative error handling
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:152:#sub my_require($) {
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-153-# my $filename = $_[0];
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-1477- 'ins_adr' =>
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:1478: 'INSERT INTO maddr (partition_tag, email, domain) VALUES (?,?,?)',
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-1479- 'ins_msg' =>
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-2460- or die "Suspicious syslog facility name: $fac";
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:2461: my $syslog_facility_num = eval("LOG_\U$fac");
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-2462- $syslog_facility_num =~ /^\d+\z/
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-4343-# local $ENV{PATH} = '/bin:/usr/bin';
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:4344:# my(@config_files) = map { `run-parts --list "$_"` } @dirs;
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-4345-# chomp(@config_files);
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-4358- foreach my $dir (@dirs) {
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:4359: push(@config_files, `run-parts --list "$dir"`);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-4360- }
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-4741-
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:4742:sub cloexec($;$$) { undef }
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:4743:# sub cloexec($;$$) { # supposedly not needed for Perl >= 5.6.0
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-4744-# my($fh,$newsetting,$name) = @_; my $flags;
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-6493-#
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:6494:sub normalize_ip_addr($) {
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-6495- my $ip = $_[0];
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-9163- my $per_recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:9164: $per_recip_obj->recip_addr($_);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-9165- $per_recip_obj->recip_addr_smtp(qquote_rfc2821_local($_));
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-12013- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:12014: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-12015- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-13519-# if ($] < 5.006) # Perl older than 5.6.0 did not set FD_CLOEXEC on sockets
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:13520:# { cloexec($_,1,$_) for @{$prop->{sock}} }
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-13521- switch_to_my_time('new request'); # timer init
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-13685- if ($sock_addr eq $peer_addr) { # common, small optimization
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:13686: $peer_addr = $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-13687- } else {
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:13688: $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:13689: $peer_addr = normalize_ip_addr($peer_addr);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-13690- }
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-13765-sub child_goes_idle($) {
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:13766: my $where = $_[0];
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-13767- do_log(5, 'child_goes_idle (%s)', $where);
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-14010- my $ip = fish_out_ip_from_received($r,$fields_ref); # possibly undef
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:14011: $ip = normalize_ip_addr($ip) if defined $ip;
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-14012- push(@trace, { ip => $ip, %$fields_ref });
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-14327- do_log(3,"client IP address unknown, fetched from Received: %s",$ip);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:14328: $msginfo->client_addr($ip); last;
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-14329- }
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-15453- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:15454: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-15455- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-17535- # copy original recipient addresses and DSN info
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:17536: $recip_obj->recip_addr($r->recip_addr);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-17537- $recip_obj->recip_addr_smtp($r->recip_addr_smtp);
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-17550- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:17551: $recip_obj->recip_addr($rec);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-17552- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($rec));
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-18657- for my $f (qw($file $altermime)) {
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:18658: my $g = $f; $g =~ s/\$/Amavis::Conf::/; my $fv_list = eval('$' . $g);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-18659- my $found = find_program_path($fv_list, $path_list_ref);
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-19775- } else { # assume port (or service) specification only, supply bind addr
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:19776: for my $bind_addr (@bind_to) { # Cartesian product: bind_addr x port
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-19777- # need brackets around an IPv6 address (as per RFC 5952, RFC 3986)
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-21615- if (exists $attr_ref->{'client_address'}) {
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:21616: $msginfo->client_addr(normalize_ip_addr($attr_ref->{'client_address'}));
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-21617- }
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-21638- my $r = $attr_ref->{'recipient'}; @recips = ();
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:21639: for my $addr (!ref($r) ? $r : @$r) {
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-21640- my $addr_quo = $addr;
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-21643- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:21644: $recip_obj->recip_addr($addr_unq);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-21645- $recip_obj->recip_addr_smtp($addr_quo);
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-22427- };
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:22428: $conn->client_ip(untaint(normalize_ip_addr($src_addr)));
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:22429: $conn->socket_ip(untaint(normalize_ip_addr($dst_addr)));
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-22430- $conn->client_port(untaint($src_port));
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-22811-
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:22812: my $cl_ip = normalize_ip_addr($xforward_args{'ADDR'});
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-22813- my $cl_port = $xforward_args{'PORT'};
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-22840-
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:22841: $msginfo->client_addr($cl_ip); # ADDR
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-22842- $msginfo->client_port($cl_port); # PORT
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-23159- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:23160: $recip_obj->recip_addr($addr);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-23161- $recip_obj->recip_addr_smtp($addr_smtp);
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-24326- if !defined $r->dsn_orcpt;
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:24327: # N.B.: change recip_addr_modified(), not recip_final_addr() !
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-24328- $r->recip_addr_modified($rcpt_addr);
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-27390- # find an existing e-mail address record for sender, or insert a new one
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:27391: ($sid,$existed) = $self->find_or_save_addr($sender_smtp,$partition_tag);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-27392- if (defined $sid) {
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-27408- if ($addr_smtp ne '') {
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:27409: ($rid,$existed) = $self->find_or_save_addr($addr_smtp,$partition_tag);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-27410- # there is perhaps 90-100% chance the recipient addr is already in the db
##############################################
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-34279- my $sdid_ace = idn_to_ascii($sig->domain);
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd:34280: for my $addr (@addr_list) {
amavisd-new-2.11.1/.pc/0010-fix-882324.patch/amavisd-34281- next if !defined $addr;
##############################################
amavisd-new-2.11.1/amavisd.conf-default-575-# 'ins_adr' =>
amavisd-new-2.11.1/amavisd.conf-default:576:# 'INSERT INTO maddr (partition_tag, email, domain) VALUES (?,?,?)',
amavisd-new-2.11.1/amavisd.conf-default-577-# 'ins_msg' =>
##############################################
amavisd-new-2.11.1/amavisd-151-# replacement for a 'require' with a more informative error handling
amavisd-new-2.11.1/amavisd:152:#sub my_require($) {
amavisd-new-2.11.1/amavisd-153-# my $filename = $_[0];
##############################################
amavisd-new-2.11.1/amavisd-1477- 'ins_adr' =>
amavisd-new-2.11.1/amavisd:1478: 'INSERT INTO maddr (partition_tag, email, domain) VALUES (?,?,?)',
amavisd-new-2.11.1/amavisd-1479- 'ins_msg' =>
##############################################
amavisd-new-2.11.1/amavisd-2460- or die "Suspicious syslog facility name: $fac";
amavisd-new-2.11.1/amavisd:2461: my $syslog_facility_num = eval("LOG_\U$fac");
amavisd-new-2.11.1/amavisd-2462- $syslog_facility_num =~ /^\d+\z/
##############################################
amavisd-new-2.11.1/amavisd-4343-# local $ENV{PATH} = '/bin:/usr/bin';
amavisd-new-2.11.1/amavisd:4344:# my(@config_files) = map { `run-parts --list "$_"` } @dirs;
amavisd-new-2.11.1/amavisd-4345-# chomp(@config_files);
##############################################
amavisd-new-2.11.1/amavisd-4358- foreach my $dir (@dirs) {
amavisd-new-2.11.1/amavisd:4359: push(@config_files, `run-parts --list "$dir"`);
amavisd-new-2.11.1/amavisd-4360- }
##############################################
amavisd-new-2.11.1/amavisd-4741-
amavisd-new-2.11.1/amavisd:4742:sub cloexec($;$$) { undef }
amavisd-new-2.11.1/amavisd:4743:# sub cloexec($;$$) { # supposedly not needed for Perl >= 5.6.0
amavisd-new-2.11.1/amavisd-4744-# my($fh,$newsetting,$name) = @_; my $flags;
##############################################
amavisd-new-2.11.1/amavisd-6493-#
amavisd-new-2.11.1/amavisd:6494:sub normalize_ip_addr($) {
amavisd-new-2.11.1/amavisd-6495- my $ip = $_[0];
##############################################
amavisd-new-2.11.1/amavisd-9163- my $per_recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/amavisd:9164: $per_recip_obj->recip_addr($_);
amavisd-new-2.11.1/amavisd-9165- $per_recip_obj->recip_addr_smtp(qquote_rfc2821_local($_));
##############################################
amavisd-new-2.11.1/amavisd-12013- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/amavisd:12014: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/amavisd-12015- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/amavisd-13519-# if ($] < 5.006) # Perl older than 5.6.0 did not set FD_CLOEXEC on sockets
amavisd-new-2.11.1/amavisd:13520:# { cloexec($_,1,$_) for @{$prop->{sock}} }
amavisd-new-2.11.1/amavisd-13521- switch_to_my_time('new request'); # timer init
##############################################
amavisd-new-2.11.1/amavisd-13685- if ($sock_addr eq $peer_addr) { # common, small optimization
amavisd-new-2.11.1/amavisd:13686: $peer_addr = $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/amavisd-13687- } else {
amavisd-new-2.11.1/amavisd:13688: $sock_addr = normalize_ip_addr($sock_addr);
amavisd-new-2.11.1/amavisd:13689: $peer_addr = normalize_ip_addr($peer_addr);
amavisd-new-2.11.1/amavisd-13690- }
##############################################
amavisd-new-2.11.1/amavisd-13765-sub child_goes_idle($) {
amavisd-new-2.11.1/amavisd:13766: my $where = $_[0];
amavisd-new-2.11.1/amavisd-13767- do_log(5, 'child_goes_idle (%s)', $where);
##############################################
amavisd-new-2.11.1/amavisd-14010- my $ip = fish_out_ip_from_received($r,$fields_ref); # possibly undef
amavisd-new-2.11.1/amavisd:14011: $ip = normalize_ip_addr($ip) if defined $ip;
amavisd-new-2.11.1/amavisd-14012- push(@trace, { ip => $ip, %$fields_ref });
##############################################
amavisd-new-2.11.1/amavisd-14327- do_log(3,"client IP address unknown, fetched from Received: %s",$ip);
amavisd-new-2.11.1/amavisd:14328: $msginfo->client_addr($ip); last;
amavisd-new-2.11.1/amavisd-14329- }
##############################################
amavisd-new-2.11.1/amavisd-15453- # leave recip_addr and recip_addr_smtp undefined to hide it from the log?
amavisd-new-2.11.1/amavisd:15454: $recip_obj->recip_addr($bcc);
amavisd-new-2.11.1/amavisd-15455- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($bcc)); #****
##############################################
amavisd-new-2.11.1/amavisd-17535- # copy original recipient addresses and DSN info
amavisd-new-2.11.1/amavisd:17536: $recip_obj->recip_addr($r->recip_addr);
amavisd-new-2.11.1/amavisd-17537- $recip_obj->recip_addr_smtp($r->recip_addr_smtp);
##############################################
amavisd-new-2.11.1/amavisd-17550- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/amavisd:17551: $recip_obj->recip_addr($rec);
amavisd-new-2.11.1/amavisd-17552- $recip_obj->recip_addr_smtp(qquote_rfc2821_local($rec));
##############################################
amavisd-new-2.11.1/amavisd-18657- for my $f (qw($file $altermime)) {
amavisd-new-2.11.1/amavisd:18658: my $g = $f; $g =~ s/\$/Amavis::Conf::/; my $fv_list = eval('$' . $g);
amavisd-new-2.11.1/amavisd-18659- my $found = find_program_path($fv_list, $path_list_ref);
##############################################
amavisd-new-2.11.1/amavisd-19775- } else { # assume port (or service) specification only, supply bind addr
amavisd-new-2.11.1/amavisd:19776: for my $bind_addr (@bind_to) { # Cartesian product: bind_addr x port
amavisd-new-2.11.1/amavisd-19777- # need brackets around an IPv6 address (as per RFC 5952, RFC 3986)
##############################################
amavisd-new-2.11.1/amavisd-21615- if (exists $attr_ref->{'client_address'}) {
amavisd-new-2.11.1/amavisd:21616: $msginfo->client_addr(normalize_ip_addr($attr_ref->{'client_address'}));
amavisd-new-2.11.1/amavisd-21617- }
##############################################
amavisd-new-2.11.1/amavisd-21638- my $r = $attr_ref->{'recipient'}; @recips = ();
amavisd-new-2.11.1/amavisd:21639: for my $addr (!ref($r) ? $r : @$r) {
amavisd-new-2.11.1/amavisd-21640- my $addr_quo = $addr;
##############################################
amavisd-new-2.11.1/amavisd-21643- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/amavisd:21644: $recip_obj->recip_addr($addr_unq);
amavisd-new-2.11.1/amavisd-21645- $recip_obj->recip_addr_smtp($addr_quo);
##############################################
amavisd-new-2.11.1/amavisd-22427- };
amavisd-new-2.11.1/amavisd:22428: $conn->client_ip(untaint(normalize_ip_addr($src_addr)));
amavisd-new-2.11.1/amavisd:22429: $conn->socket_ip(untaint(normalize_ip_addr($dst_addr)));
amavisd-new-2.11.1/amavisd-22430- $conn->client_port(untaint($src_port));
##############################################
amavisd-new-2.11.1/amavisd-22811-
amavisd-new-2.11.1/amavisd:22812: my $cl_ip = normalize_ip_addr($xforward_args{'ADDR'});
amavisd-new-2.11.1/amavisd-22813- my $cl_port = $xforward_args{'PORT'};
##############################################
amavisd-new-2.11.1/amavisd-22841-
amavisd-new-2.11.1/amavisd:22842: $msginfo->client_addr($cl_ip); # ADDR
amavisd-new-2.11.1/amavisd-22843- $msginfo->client_port($cl_port); # PORT
##############################################
amavisd-new-2.11.1/amavisd-23160- my $recip_obj = Amavis::In::Message::PerRecip->new;
amavisd-new-2.11.1/amavisd:23161: $recip_obj->recip_addr($addr);
amavisd-new-2.11.1/amavisd-23162- $recip_obj->recip_addr_smtp($addr_smtp);
##############################################
amavisd-new-2.11.1/amavisd-24327- if !defined $r->dsn_orcpt;
amavisd-new-2.11.1/amavisd:24328: # N.B.: change recip_addr_modified(), not recip_final_addr() !
amavisd-new-2.11.1/amavisd-24329- $r->recip_addr_modified($rcpt_addr);
##############################################
amavisd-new-2.11.1/amavisd-27391- # find an existing e-mail address record for sender, or insert a new one
amavisd-new-2.11.1/amavisd:27392: ($sid,$existed) = $self->find_or_save_addr($sender_smtp,$partition_tag);
amavisd-new-2.11.1/amavisd-27393- if (defined $sid) {
##############################################
amavisd-new-2.11.1/amavisd-27409- if ($addr_smtp ne '') {
amavisd-new-2.11.1/amavisd:27410: ($rid,$existed) = $self->find_or_save_addr($addr_smtp,$partition_tag);
amavisd-new-2.11.1/amavisd-27411- # there is perhaps 90-100% chance the recipient addr is already in the db
##############################################
amavisd-new-2.11.1/amavisd-34280- my $sdid_ace = idn_to_ascii($sig->domain);
amavisd-new-2.11.1/amavisd:34281: for my $addr (@addr_list) {
amavisd-new-2.11.1/amavisd-34282- next if !defined $addr;