Skip to content

Commit 0b2c411

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1'
2 parents df8e423 + f746308 commit 0b2c411

File tree

298 files changed

+1042
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+1042
-732
lines changed

‎install/install.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,17 +328,20 @@
328328
} else swriteln('[ERROR] Postfix not installed - skipping Mail');
329329

330330
//* Check for DNS
331-
if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
332-
$conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
331+
// if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
332+
if(!$conf['bind']['installed'] && !$conf['mydns']['installed']) {
333+
// $conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS', false);
333334
$conf['bind']['installed'] = $inst->force_configure_app('BIND', false);
334335
$conf['mydns']['installed'] = $inst->force_configure_app('MyDNS', false);
335336
}
336337
//* Configure PowerDNS
338+
/*
337339
if($conf['powerdns']['installed']) {
338340
swriteln('Configuring PowerDNS');
339341
$inst->configure_powerdns();
340342
$conf['services']['dns'] = true;
341343
}
344+
*/
342345
//* Configure Bind
343346
if($conf['bind']['installed']) {
344347
swriteln('Configuring BIND');

‎install/lib/installer_base.lib.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,15 @@ public function grant_master_database_rights($verbose = false) {
658658
if(!$this->dbmaster->query($query, $value['db'] . '.mail_backup', $value['user'], $host)) {
659659
$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
660660
}
661+
662+
$query = "GRANT SELECT, UPDATE(`dnssec_initialized`, `dnssec_info`, `dnssec_last_signed`) ON ?? TO ?@?";
663+
if ($verbose){
664+
echo $query ."\n";
665+
}
666+
if(!$this->dbmaster->query($query, $value['db'] . '.dns_soa', $value['user'], $host)) {
667+
$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
668+
}
669+
661670
}
662671

663672
}

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ALTER TABLE `client_template`
2525

2626
ALTER TABLE `client` ADD `contact_firstname` VARCHAR( 64 ) NOT NULL DEFAULT '' AFTER `gender`;
2727

28-
UPDATE `dns_template` SET `fields` = 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM' WHERE `dns_template`.`template_id` =1;
28+
UPDATE `dns_template` SET `fields` = 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM,DNSSEC' WHERE `dns_template`.`template_id` =1;
2929
UPDATE `dns_template` SET `template` = '[ZONE]
3030
origin={DOMAIN}.
3131
ns={NS1}.
@@ -225,4 +225,29 @@ ALTER TABLE `web_database` ADD COLUMN `quota_exceeded` enum('n','y') NOT NULL DE
225225

226226
ALTER TABLE `client` ADD COLUMN `limit_database_user` int(11) NOT NULL DEFAULT '-1' after limit_database;
227227
ALTER TABLE `client_template` ADD COLUMN `limit_database_user` int(11) NOT NULL DEFAULT '-1' after limit_database;
228+
ALTER TABLE `client` CHANGE `customer_no_template` `customer_no_template` VARCHAR(255) NULL DEFAULT 'R[CLIENTID]C[CUSTOMER_NO]';
228229

230+
ALTER TABLE `client` CHANGE `added_date` `added_date` DATE NULL DEFAULT NULL;
231+
ALTER TABLE `ftp_user` CHANGE `expires` `expires` DATETIME NULL DEFAULT NULL;
232+
ALTER TABLE `mail_user` CHANGE `autoresponder_start_date` `autoresponder_start_date` DATETIME NULL DEFAULT NULL;
233+
ALTER TABLE `mail_user` CHANGE `autoresponder_end_date` `autoresponder_end_date` DATETIME NULL DEFAULT NULL;
234+
ALTER TABLE `openvz_traffic` CHANGE `traffic_date` `traffic_date` DATE NULL DEFAULT NULL;
235+
ALTER TABLE `openvz_vm` CHANGE `active_until_date` `active_until_date` DATE NULL DEFAULT NULL;
236+
ALTER TABLE `sys_session` CHANGE `date_created` `date_created` DATETIME NULL DEFAULT NULL;
237+
ALTER TABLE `sys_session` CHANGE `last_updated` `last_updated` DATETIME NULL DEFAULT NULL;
238+
ALTER TABLE `web_domain` CHANGE `added_date` `added_date` DATE NULL DEFAULT NULL;
239+
ALTER TABLE `web_traffic` CHANGE `traffic_date` `traffic_date` DATE NULL DEFAULT NULL;
240+
241+
UPDATE `client` SET `added_date` = NULL WHERE `added_date` = '0000-00-00';
242+
UPDATE `ftp_user` SET `expires` = NULL WHERE `expires` = '0000-00-00 00:00:00';
243+
UPDATE `mail_user` SET `autoresponder_start_date` = NULL WHERE `autoresponder_start_date` = '0000-00-00 00:00:00';
244+
UPDATE `mail_user` SET `autoresponder_end_date` = NULL WHERE `autoresponder_end_date` = '0000-00-00 00:00:00';
245+
UPDATE `openvz_traffic` SET `traffic_date` = NULL WHERE `traffic_date` = '0000-00-00';
246+
UPDATE `openvz_vm` SET `active_until_date` = NULL WHERE `active_until_date` = '0000-00-00';
247+
UPDATE `sys_session` SET `date_created` = NULL WHERE `date_created` = '0000-00-00 00:00:00';
248+
UPDATE `sys_session` SET `last_updated` = NULL WHERE `last_updated` = '0000-00-00 00:00:00';
249+
UPDATE `web_domain` SET `added_date` = NULL WHERE `added_date` = '0000-00-00';
250+
UPDATE `web_traffic` SET `traffic_date` = NULL WHERE `traffic_date` = '0000-00-00';
251+
ALTER TABLE `web_domain` ADD `http_port` INT NOT NULL DEFAULT '80' , ADD `https_port` INT NOT NULL DEFAULT '443' ;
252+
253+

‎install/sql/ispconfig3.sql‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ CREATE TABLE `client` (
255255
`tmp_data` mediumblob,
256256
`id_rsa` varchar(2000) NOT NULL DEFAULT '',
257257
`ssh_rsa` varchar(600) NOT NULL DEFAULT '',
258-
`customer_no_template` varchar(255) DEFAULT 'C[CUSTOMER_NO]',
258+
`customer_no_template` varchar(255) DEFAULT 'R[CLIENTID]C[CUSTOMER_NO]',
259259
`customer_no_start` int(11) NOT NULL DEFAULT '1',
260260
`customer_no_counter` int(11) NOT NULL DEFAULT '0',
261-
`added_date` date NOT NULL DEFAULT '0000-00-00',
261+
`added_date` date NULL DEFAULT NULL,
262262
`added_by` varchar(255) DEFAULT NULL,
263263
`validation_status` enum('accept','review','reject') NOT NULL DEFAULT 'accept',
264264
`risk_score` int(10) unsigned NOT NULL DEFAULT '0',
@@ -638,7 +638,7 @@ CREATE TABLE `ftp_user` (
638638
`dl_ratio` int(11) NOT NULL default '-1',
639639
`ul_bandwidth` int(11) NOT NULL default '-1',
640640
`dl_bandwidth` int(11) NOT NULL default '-1',
641-
`expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
641+
`expires` datetime NULL DEFAULT NULL,
642642
PRIMARY KEY (`ftp_user_id`),
643643
KEY `active` (`active`),
644644
KEY `server_id` (`server_id`),
@@ -962,8 +962,8 @@ CREATE TABLE `mail_user` (
962962
`sender_cc` varchar(255) NOT NULL default '',
963963
`homedir` varchar(255) NOT NULL default '',
964964
`autoresponder` enum('n','y') NOT NULL default 'n',
965-
`autoresponder_start_date` datetime NOT NULL default '0000-00-00 00:00:00',
966-
`autoresponder_end_date` datetime NOT NULL default '0000-00-00 00:00:00',
965+
`autoresponder_start_date` datetime NULL default NULL,
966+
`autoresponder_end_date` datetime NULL default NULL,
967967
`autoresponder_subject` varchar(255) NOT NULL default 'Out of office reply',
968968
`autoresponder_text` mediumtext NULL,
969969
`move_junk` enum('n','y') NOT NULL default 'n',
@@ -1151,7 +1151,7 @@ INSERT INTO `openvz_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_
11511151

11521152
CREATE TABLE IF NOT EXISTS `openvz_traffic` (
11531153
`veid` int(11) NOT NULL DEFAULT '0',
1154-
`traffic_date` date NOT NULL DEFAULT '0000-00-00',
1154+
`traffic_date` date NULL DEFAULT NULL,
11551155
`traffic_bytes` bigint(32) unsigned NOT NULL DEFAULT '0',
11561156
PRIMARY KEY (`veid`,`traffic_date`)
11571157
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1184,7 +1184,7 @@ CREATE TABLE IF NOT EXISTS `openvz_vm` (
11841184
`start_boot` varchar(255) NOT NULL DEFAULT 'y',
11851185
`bootorder` int(11) NOT NULL DEFAULT '1',
11861186
`active` varchar(255) NOT NULL DEFAULT 'y',
1187-
`active_until_date` date NOT NULL DEFAULT '0000-00-00',
1187+
`active_until_date` date NULL DEFAULT NULL,
11881188
`description` text,
11891189
`diskspace` int(11) NOT NULL DEFAULT '0',
11901190
`traffic` int(11) NOT NULL DEFAULT '-1',
@@ -1739,8 +1739,8 @@ CREATE TABLE `sys_remoteaction` (
17391739

17401740
CREATE TABLE `sys_session` (
17411741
`session_id` varchar(64) NOT NULL DEFAULT '',
1742-
`date_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
1743-
`last_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
1742+
`date_created` datetime NULL DEFAULT NULL,
1743+
`last_updated` datetime NULL DEFAULT NULL,
17441744
`permanent` enum('n','y') NOT NULL DEFAULT 'n',
17451745
`session_data` longtext,
17461746
PRIMARY KEY (`session_id`),
@@ -1972,7 +1972,7 @@ CREATE TABLE `web_domain` (
19721972
`enable_spdy` ENUM('y','n') NULL DEFAULT 'n',
19731973
`last_quota_notification` date NULL default NULL,
19741974
`rewrite_rules` mediumtext,
1975-
`added_date` date NOT NULL DEFAULT '0000-00-00',
1975+
`added_date` date NULL DEFAULT NULL,
19761976
`added_by` varchar(255) DEFAULT NULL,
19771977
`directive_snippets_id` int(11) unsigned NOT NULL default '0',
19781978
`enable_pagespeed` ENUM('y','n') NOT NULL DEFAULT 'n',
@@ -2041,7 +2041,7 @@ CREATE TABLE IF NOT EXISTS `web_folder_user` (
20412041

20422042
CREATE TABLE `web_traffic` (
20432043
`hostname` varchar(255) NOT NULL DEFAULT '',
2044-
`traffic_date` date NOT NULL DEFAULT '0000-00-00',
2044+
`traffic_date` date NULL DEFAULT NULL,
20452045
`traffic_bytes` bigint(32) unsigned NOT NULL default '0',
20462046
PRIMARY KEY (`hostname`,`traffic_date`)
20472047
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;
@@ -2397,7 +2397,7 @@ INSERT INTO `country` (`iso`, `name`, `printable_name`, `iso3`, `numcode`, `eu`)
23972397
-- Dumping data for table `dns_template`
23982398
--
23992399

2400-
INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=3600\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600\nTXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600', 'y');
2400+
INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM,DNSSEC', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=3600\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600\nTXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600', 'y');
24012401

24022402

24032403
-- --------------------------------------------------------

‎install/tpl/debian_postfix.conf.master‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
2525
smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
2626
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2727
smtpd_helo_required = yes
28-
smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, warn_if_reject reject_unknown_helo_hostname, permit
29-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re{reject_slm}, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
28+
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
29+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
3030
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
3131
smtpd_client_message_rate_limit = 100
3232
maildrop_destination_concurrency_limit = 1
@@ -43,8 +43,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
4343
smtp_tls_protocols = !SSLv2,!SSLv3
4444
smtpd_tls_exclude_ciphers = RC4, aNULL
4545
smtp_tls_exclude_ciphers = RC4, aNULL
46-
strict_rfc821_envelopes = yes
47-
disable_vrfy_command = yes
48-
allow_percent_hack = no
49-
swap_bangpath = no
50-
smtpd_reject_unlisted_sender = yes

‎install/tpl/fedora_postfix.conf.master‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
2222
smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
2323
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2424
smtpd_helo_required = yes
25-
smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, warn_if_reject reject_unknown_helo_hostname, permit
26-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re{reject_slm}, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
25+
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
26+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2727
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
2828
smtpd_client_message_rate_limit = 100
2929
maildrop_destination_concurrency_limit = 1
@@ -40,8 +40,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
4040
smtp_tls_protocols = !SSLv2,!SSLv3
4141
smtpd_tls_exclude_ciphers = RC4, aNULL
4242
smtp_tls_exclude_ciphers = RC4, aNULL
43-
strict_rfc821_envelopes = yes
44-
disable_vrfy_command = yes
45-
allow_percent_hack = no
46-
swap_bangpath = no
47-
smtpd_reject_unlisted_sender = yes

‎install/tpl/gentoo_postfix.conf.master‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
2121
smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
2222
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2323
smtpd_helo_required = yes
24-
smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, warn_if_reject reject_unknown_helo_hostname, permit
25-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re{reject_slm}, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
24+
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
25+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2626
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
2727
smtpd_client_message_rate_limit = 100
2828
maildrop_destination_concurrency_limit = 1
@@ -39,8 +39,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
3939
smtp_tls_protocols = !SSLv2,!SSLv3
4040
smtpd_tls_exclude_ciphers = RC4, aNULL
4141
smtp_tls_exclude_ciphers = RC4, aNULL
42-
strict_rfc821_envelopes = yes
43-
disable_vrfy_command = yes
44-
allow_percent_hack = no
45-
swap_bangpath = no
46-
smtpd_reject_unlisted_sender = yes

‎install/tpl/opensuse_postfix.conf.master‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ relay_recipient_maps = mysql:{config_dir}/mysql-virtual_relayrecipientmaps.cf
2424
smtpd_sender_login_maps = proxy:mysql:{config_dir}/mysql-virtual_sender_login_maps.cf
2525
proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps $virtual_alias_domains $sender_bcc_maps $virtual_mailbox_maps $virtual_mailbox_domains $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks $smtpd_sender_login_maps
2626
smtpd_helo_required = yes
27-
smtpd_helo_restrictions = reject_invalid_helo_hostname, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, permit_sasl_authenticated, reject_non_fqdn_helo_hostname, check_helo_access regexp:{config_dir}/blacklist_helo, warn_if_reject reject_unknown_helo_hostname, permit
28-
smtpd_sender_restrictions = check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf regexp:{config_dir}/tag_as_originating.re{reject_slm}, permit_mynetworks, check_sender_access regexp:{config_dir}/tag_as_foreign.re
27+
smtpd_helo_restrictions = permit_sasl_authenticated, permit_mynetworks, check_helo_access regexp:{config_dir}/helo_access, reject_invalid_hostname, reject_non_fqdn_hostname, check_helo_access regexp:{config_dir}/blacklist_helo
28+
smtpd_sender_restrictions = check_sender_access regexp:{config_dir}/tag_as_originating.re {reject_slm}, permit_mynetworks, check_sender_access mysql:{config_dir}/mysql-virtual_sender.cf, check_sender_access regexp:{config_dir}/tag_as_foreign.re
2929
smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual_client.cf
3030
smtpd_client_message_rate_limit = 100
3131
maildrop_destination_concurrency_limit = 1
@@ -42,8 +42,3 @@ smtpd_tls_protocols = !SSLv2,!SSLv3
4242
smtp_tls_protocols = !SSLv2,!SSLv3
4343
smtpd_tls_exclude_ciphers = RC4, aNULL
4444
smtp_tls_exclude_ciphers = RC4, aNULL
45-
strict_rfc821_envelopes = yes
46-
disable_vrfy_command = yes
47-
allow_percent_hack = no
48-
swap_bangpath = no
49-
smtpd_reject_unlisted_sender = yes

0 commit comments

Comments
 (0)