diff --git a/data/conf/dovecot/dovecot.conf b/data/conf/dovecot/dovecot.conf index f07c0e19..01243091 100644 --- a/data/conf/dovecot/dovecot.conf +++ b/data/conf/dovecot/dovecot.conf @@ -45,12 +45,25 @@ recipient_delimiter = + auth_master_user_separator = * mail_shared_explicit_inbox = yes mail_prefetch_count = 30 +# try a master passwd passdb { driver = passwd-file args = /etc/dovecot/dovecot-master.passwd master = yes pass = yes + result_failure = continue + result_internalfail = continue } +# try an app passwd +passdb { + args = /etc/dovecot/sql/dovecot-dict-sql-app-passdb.conf + driver = sql + pass = yes + result_failure = continue + result_internalfail = continue +} +# check for regular password - if empty (e.g. force-passwd-reset), previous pass=yes passdbs also fail +# a return of the following passdb is mandatory passdb { args = /etc/dovecot/sql/dovecot-dict-sql-passdb.conf driver = sql diff --git a/data/web/admin.php b/data/web/admin.php index 5b401243..855894a7 100644 --- a/data/web/admin.php +++ b/data/web/admin.php @@ -98,6 +98,7 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC
=$lang['admin']['customer_id'];?>: =(isset($_SESSION['gal']['c'])) ? $_SESSION['gal']['c'] : '?';?> - =$lang['admin']['service_id'];?>: =(isset($_SESSION['gal']['s'])) ? $_SESSION['gal']['s'] : '?';?> + =$lang['admin']['sal_level'];?>: =(isset($_SESSION['gal']['m'])) ? $_SESSION['gal']['m'] : '?';?>
diff --git a/data/web/edit.php b/data/web/edit.php index bf730c84..4556917d 100644 --- a/data/web/edit.php +++ b/data/web/edit.php @@ -1314,6 +1314,54 @@ if (isset($_SESSION['mailcow_cc_role'])) { +=$lang['user']['app_hint'];?>
+