Skip to content

Commit d5aca6a

Browse files
author
Marius Burkard
committed
Merge branch '6048-postfix-references-non-existent-sasl_passwd-file' into 'develop'
Resolve "postfix: references non-existent sasl_passwd file" Closes #6048 See merge request ispconfig/ispconfig3!1407
2 parents 88c60a5 + 31ad5b7 commit d5aca6a

File tree

8 files changed

+8
-4
lines changed

8 files changed

+8
-4
lines changed

install/dist/lib/fedora.lib.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ function configure_postfix($options = '')
162162
touch($config_dir.'/mime_header_checks');
163163
touch($config_dir.'/nested_header_checks');
164164
touch($config_dir.'/body_checks');
165+
touch($config_dir.'/sasl_passwd');
165166

166167
//* Create the mailman files
167168
if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');

install/dist/lib/gentoo.lib.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ public function configure_postfix($options = '')
160160
touch($config_dir.'/mime_header_checks');
161161
touch($config_dir.'/nested_header_checks');
162162
touch($config_dir.'/body_checks');
163+
touch($config_dir.'/sasl_passwd');
163164

164165
//* Create auxillary postfix conf files
165166
$configfile = 'helo_access';

install/dist/lib/opensuse.lib.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ function configure_postfix($options = '')
176176
touch($config_dir.'/mime_header_checks');
177177
touch($config_dir.'/nested_header_checks');
178178
touch($config_dir.'/body_checks');
179+
touch($config_dir.'/sasl_passwd');
179180

180181
//* Create the mailman files
181182
if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');

install/lib/installer_base.lib.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,6 +1200,7 @@ public function configure_postfix($options = '') {
12001200
touch($config_dir.'/mime_header_checks');
12011201
touch($config_dir.'/nested_header_checks');
12021202
touch($config_dir.'/body_checks');
1203+
touch($config_dir.'/sasl_passwd');
12031204

12041205
//* Create the mailman files
12051206
if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');

install/tpl/debian_postfix.conf.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ address_verify_negative_refresh_time=60s
5454
# needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
5555
enable_original_recipient = yes
5656
sender_dependent_relayhost_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayhost.cf
57-
smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, hash:{config_dir}/sasl_passwd
57+
smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, texthash:{config_dir}/sasl_passwd
5858
smtp_sender_dependent_authentication = yes
5959
smtp_sasl_auth_enable = yes
6060
smtp_sasl_security_options = noanonymous, noplaintext

install/tpl/fedora_postfix.conf.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ address_verify_negative_refresh_time=60s
5050
# needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
5151
enable_original_recipient = yes
5252
sender_dependent_relayhost_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayhost.cf
53-
smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, hash:{config_dir}/sasl_passwd
53+
smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, texthash:{config_dir}/sasl_passwd
5454
smtp_sender_dependent_authentication = yes
5555
smtp_sasl_auth_enable = yes
5656
smtp_sasl_security_options = noanonymous, noplaintext

install/tpl/gentoo_postfix.conf.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ address_verify_negative_refresh_time=60s
4949
# needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
5050
enable_original_recipient = yes
5151
sender_dependent_relayhost_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayhost.cf
52-
smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, hash:{config_dir}/sasl_passwd
52+
smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, texthash:{config_dir}/sasl_passwd
5353
smtp_sender_dependent_authentication = yes
5454
smtp_sasl_auth_enable = yes
5555
smtp_sasl_security_options = noanonymous, noplaintext

install/tpl/opensuse_postfix.conf.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ address_verify_negative_refresh_time=60s
5252
# needed for postfix < 3.3 when using reject_unverified_recipient (lmtp):
5353
enable_original_recipient = yes
5454
sender_dependent_relayhost_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayhost.cf
55-
smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, hash:{config_dir}/sasl_passwd
55+
smtp_sasl_password_maps = proxy:mysql:{config_dir}/mysql-virtual_sender-relayauth.cf, texthash:{config_dir}/sasl_passwd
5656
smtp_sender_dependent_authentication = yes
5757
smtp_sasl_auth_enable = yes
5858
smtp_sasl_security_options = noanonymous, noplaintext

0 commit comments

Comments
 (0)