Merge ~ahasenack/ubuntu/+source/postfix:postfix-postconf-segfault-1753470 into ubuntu/+source/postfix:ubuntu/devel

[Andreas Hasenack]

  * debian/patches/fix-postconf-segfault.diff: Fix a postconf segfault
    when map file cannot be read. Thanks to Viktor Dukhovni <postfix-
    <email address hidden>>. (LP: #1753470)

Steps to reproduce:

sudo apt install postfix
echo "virtual_alias_maps = pgsql:/etc/postfix/valiases.cf" | sudo tee -a /etc/postfix/main.cf
sudo truncate -s 0 /etc/postfix/valiases.cf
sudo chmod 0600 /etc/postfix/valiases.cf
postconf <--- segfaults as a regular user who cannot read the valiases.cf file

PPA with a fixed package:
sudo add-apt-repository -y -u ppa:ahasenack/postfix-postconf-segfault-1753470
sudo apt dist-upgrade
postconf <--- outputs the configuration, ignoring the EACCES error

The patch from Viktor at https://marc.info/?l=postfix-users&m=152578771531514&w=2 was ACK'ed by Wietse in https://marc.info/?l=postfix-users&m=152584869731079&w=2

[Christian Ehrhardt  (paelzer)]

- Confirmed the error exists and is reproducible
- Confirmed the test build in the ppa fixes the issue
- changelog ok
- version number ok
- Thanks for already having a Debian bug and upstream discussion
- patch LGTM as well (it is not yet upstream but as close as it can be)

Keep in mind that we might need to adapt if upstream changes its mind on it.
But for Cosmic this should be fine where we can re-roll fast and OTOH before the SRU to Bionic happens we have a few days of push/build/test/prep/SRU-review ... until then you'll know if upstream changed the approach to fix it.

Ack for the MP here +1

review: Approve

[Andreas Hasenack (ahasenack)]

When you have a moment, could you please push the upload tag and dput the package? Thanks

[Christian Ehrhardt  (paelzer)]

On Wed, May 9, 2018 at 7:21 PM, Andreas Hasenack <email address hidden>
wrote:

> When you have a moment, could you please push the upload tag and dput the
> package? Thanks
>

Seems I came by IRC in the right moment: tagged, pushed and sponsored.

diff --git a/debian/changelog b/debian/changelog
index 6d9e675..b5f577c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+postfix (3.3.0-1ubuntu1) cosmic; urgency=medium
+
+  * debian/patches/fix-postconf-segfault.diff: Fix a postconf segfault
+    when map file cannot be read.  Thanks to Viktor Dukhovni <postfix-
+    [e-mail]>. (LP: #1753470)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 09 May 2018 09:51:09 -0300
+
 postfix (3.3.0-1) unstable; urgency=medium
 
   [Wietse Venema]
diff --git a/debian/patches/fix-postconf-segfault.diff b/debian/patches/fix-postconf-segfault.diff
new file mode 100644
index 0000000..f8eef6b
--- /dev/null
+++ b/debian/patches/fix-postconf-segfault.diff
@@ -0,0 +1,25 @@
+Description: Fix a postconf segfault when map file cannot be read
+Author: Viktor Dukhovni <[e-mail]>
+Origin: https://marc.info/?l=postfix-users&m=152578771531514&w=2
+Bug-Debian: https://bugs.debian.org/898271
+Bug-Ubuntu: https://launchpad.net/bugs/1753470
+Last-Update: 2018-05-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/postconf/postconf_dbms.c
++++ b/src/postconf/postconf_dbms.c
+@@ -174,10 +174,10 @@
+ 	 */
+ 	dict = dict_ht_open(dict_spec, O_CREAT | O_RDWR, 0);
+ 	dict_register(dict_spec, dict);
+-	if ((fp = vstream_fopen(cf_file, O_RDONLY, 0)) == 0
+-	    && errno != EACCES) {
+-	    msg_warn("open \"%s\" configuration \"%s\": %m",
+-		     dp->db_type, cf_file);
++	if ((fp = vstream_fopen(cf_file, O_RDONLY, 0)) == 0) {
++        if (errno != EACCES)
++	        msg_warn("open \"%s\" configuration \"%s\": %m",
++		             dp->db_type, cf_file);
+ 	    myfree(dict_spec);
+ 	    return;
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index c2e4727..1f77ec0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 50_LANG.diff
 70_postfix-check.diff
 tls_version.diff
+fix-postconf-segfault.diff