Merge branch 'master' into 'master'

FS#3749 - Disable smtp checkbox in mailbox setting has no effect on courier servers

See merge request !199

install/tpl/authmysqlrc.master

@@ -15,4 +15,5 @@ MYSQL_MAILDIR_FIELD maildir
 MYSQL_QUOTA_FIELD quota
 #MYSQL_QUOTA_FIELD concat(quota,'S')
 #MYSQL_WHERE_CLAUSE      access='y'
-MYSQL_AUXOPTIONS_FIELD concat('disableimap=',disableimap,',disablepop3=',disablepop3)
+#MYSQL_AUXOPTIONS_FIELD concat('disableimap=',disableimap,',disablepop3=',disablepop3)
\ No newline at end of file
+MYSQL_AUXOPTIONS_FIELD concat('disableimap=', if(disableimap = 'y', 1, 0), ',', 'disablepop3=', if(disablepop3 = 'y', 1, 0))
\ No newline at end of file