Skip to content

INC1329087 - respect params for

The variables inside were being loaded from local scope only and not from the scope where they were set in particular.

Thise uses to the scope.lookupvar method to be consistent with the other files.

The result of this patch is the following diff to

This does result in mail being sent from rather than the cannonical name.

--- /etc/mail/	2019-07-05 12:51:30.380771835 +0200
+++ /etc/mail/	2019-07-05 12:50:43.343748449 +0200
@@ -23,7 +23,7 @@
 dnl # Uncomment and edit the following line if your outgoing mail needs to
 dnl # be sent out through an external mail server:
 dnl #
-dnl define(`SMART_HOST', `smtp.your.provider')dnl
+define(`SMART_HOST', `')dnl
 dnl #
 define(`confDEF_USER_ID', ``8:12'')dnl
 dnl define(`confAUTO_REBUILD')dnl
@@ -113,7 +113,7 @@
 dnl # and not on any other network devices. Remove the loopback
 dnl # address restriction to accept email from the internet or intranet.
 dnl #
-DAEMON_OPTIONS(`Port=smtp,Addr=, Name=MTA')dnl
+DAEMON_OPTIONS(`Port=smtp, Name=MTA')dnl
 dnl #
 dnl # The following causes sendmail to additionally listen to port 587 for
 dnl # mail from MUAs that authenticate. Roaming users who can't reach their
@@ -157,11 +157,11 @@
 dnl # The following example makes mail from this host and any additional
 dnl # specified domains appear to be sent from
 dnl #
-dnl MASQUERADE_AS(`')dnl
 dnl #
 dnl # masquerade not just the headers, but the envelope as well
 dnl #
-dnl FEATURE(masquerade_envelope)dnl
 dnl #
 dnl # masquerade not just, but @* as well
 dnl #
@@ -174,3 +174,6 @@
 dnl MAILER(cyrusv2)dnl

Merge request reports