From 0f155024035a50bb8def28aa5e48413532220e4f Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Fri, 31 Jul 2015 22:02:32 +0800
Subject: [PATCH] Sync upgrade tutorial for iRedMail-0.9.3.

---
 en_US/howto/dovecot.master.user.md            |  4 ++++
 .../upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md | 23 +++++++++++++++++++
 html/dovecot.master.user.html                 |  4 ++++
 html/upgrade.iredmail.0.9.2-0.9.3.html        | 23 +++++++++++++++++++
 4 files changed, 54 insertions(+)

diff --git a/en_US/howto/dovecot.master.user.md b/en_US/howto/dovecot.master.user.md
index 288a318f..a9c377e7 100644
--- a/en_US/howto/dovecot.master.user.md
+++ b/en_US/howto/dovecot.master.user.md
@@ -49,3 +49,7 @@ topic in our forum and paste related log:
 
 * [Debug Dovecot](./debug.dovecot.html)
 * [iRedMail online support forum](http://www.iredmail.org/forum/)
+
+## References
+
+* Dovecot wiki: [Master users/passwords](http://wiki2.dovecot.org/Authentication/MasterUsers)
diff --git a/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md b/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md
index 78b5d00f..a52b857e 100644
--- a/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md
+++ b/en_US/upgrade/0-upgrade.iredmail.0.9.2-0.9.3.md
@@ -222,6 +222,29 @@ dovecot unix    -       n       n       -       -      pipe
 
 ## OpenLDAP backend special
 
+### Fixed: Dovecot Master User doesn't work with ACL plugin
+
+iRedMail has both Dovecot Master User and Dovecot `acl` plugin enabled by
+default, if `acl` plugin is enabled, the Master User is still subject to ACLs
+just like any other user, which means that by default the Master User has no
+access to any mailboxes of the user. Please fix this issue by following steps
+below.
+
+* Open file `/etc/dovecot/dovecot-ldap.conf` (Linux/OpenBSD) or
+  `/usr/local/etc/dovecot/dovecot-ldap.conf` (FreeBSD), find below line:
+
+```
+user_attrs      = mail=user, ...
+```
+
+* Add new setting `mail=master_user` in `user_attrs` like below:
+
+```
+user_attrs      = mail=master_user,mail=user, ...
+```
+
+* Restart Dovecot service.
+
 ### Add new SQL table `outbound_wblist` in `amavisd` database
 
 We need a new SQL table `outbound_wblist` in `amavisd` database, it's used
diff --git a/html/dovecot.master.user.html b/html/dovecot.master.user.html
index b85aa7a8..d2b6e873 100644
--- a/html/dovecot.master.user.html
+++ b/html/dovecot.master.user.html
@@ -52,6 +52,10 @@ topic in our forum and paste related log:</p>
 <ul>
 <li><a href="./debug.dovecot.html">Debug Dovecot</a></li>
 <li><a href="http://www.iredmail.org/forum/">iRedMail online support forum</a></li>
+</ul>
+<h2 id="references">References</h2>
+<ul>
+<li>Dovecot wiki: <a href="http://wiki2.dovecot.org/Authentication/MasterUsers">Master users/passwords</a></li>
 </ul><p style="text-align: center; color: grey;">Document published under a <a href="http://creativecommons.org/licenses/by-nd/3.0/us/" target="_blank">CC BY-ND 3.0</a> license. If you found something wrong, please do <a href="http://www.iredmail.org/contact.html">contact us</a> to fix it.<script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/html/upgrade.iredmail.0.9.2-0.9.3.html b/html/upgrade.iredmail.0.9.2-0.9.3.html
index 543ca96c..f62cd2c8 100644
--- a/html/upgrade.iredmail.0.9.2-0.9.3.html
+++ b/html/upgrade.iredmail.0.9.2-0.9.3.html
@@ -26,6 +26,7 @@
 </ul>
 </li>
 <li><a href="#openldap-backend-special">OpenLDAP backend special</a><ul>
+<li><a href="#fixed-dovecot-master-user-doesnt-work-with-acl-plugin">Fixed: Dovecot Master User doesn't work with ACL plugin</a></li>
 <li><a href="#add-new-sql-table-outbound_wblist-in-amavisd-database">Add new SQL table outbound_wblist in amavisd database</a></li>
 </ul>
 </li>
@@ -239,6 +240,28 @@ dovecot unix    -       n       n       -       -      pipe
 <li>Save your change and restart Postfix service.</li>
 </ul>
 <h2 id="openldap-backend-special">OpenLDAP backend special</h2>
+<h3 id="fixed-dovecot-master-user-doesnt-work-with-acl-plugin">Fixed: Dovecot Master User doesn't work with ACL plugin</h3>
+<p>iRedMail has both Dovecot Master User and Dovecot <code>acl</code> plugin enabled by
+default, if <code>acl</code> plugin is enabled, the Master User is still subject to ACLs
+just like any other user, which means that by default the Master User has no
+access to any mailboxes of the user. Please fix this issue by following steps
+below.</p>
+<ul>
+<li>Open file <code>/etc/dovecot/dovecot-ldap.conf</code> (Linux/OpenBSD) or
+  <code>/usr/local/etc/dovecot/dovecot-ldap.conf</code> (FreeBSD), find below line:</li>
+</ul>
+<pre><code>user_attrs      = mail=user, ...
+</code></pre>
+
+<ul>
+<li>Add new setting <code>mail=master_user</code> in <code>user_attrs</code> like below:</li>
+</ul>
+<pre><code>user_attrs      = mail=master_user,mail=user, ...
+</code></pre>
+
+<ul>
+<li>Restart Dovecot service.</li>
+</ul>
 <h3 id="add-new-sql-table-outbound_wblist-in-amavisd-database">Add new SQL table <code>outbound_wblist</code> in <code>amavisd</code> database</h3>
 <p>We need a new SQL table <code>outbound_wblist</code> in <code>amavisd</code> database, it's used
 to store white/blacklists for outbound message, required by iRedAPD plugin