Merge branch 'prime' into master

Author: jengelh

exch/mysql_adaptor/mysql_adaptor.cpp

@@ -83,6 +83,7 @@ errno_t mysql_plugin::meta(const char *username, unsigned int wantpriv,
 		" LEFT JOIN orgparam AS op6 ON orgs.id=op6.org_id AND op6.key='ldap_start_tls'"
 		" LEFT JOIN altnames AS alt ON u.id=alt.user_id AND alt.altname='" +
 		q_user + "' WHERE " + q_where + " LIMIT 2) UNION"
+
 		"(SELECT u.password, dt.propval_str AS dtypx, u.address_status, "
 		"u.privilege_bits, u.maildir, u.lang, u.externid, "
 		"op1.value, op2.value, op3.value, op4.value, op5.value, op6.value, "
@@ -96,7 +97,8 @@ errno_t mysql_plugin::meta(const char *username, unsigned int wantpriv,
 		" LEFT JOIN orgparam AS op5 ON orgs.id=op5.org_id AND op5.key='ldap_mail_attr'"
 		" LEFT JOIN orgparam AS op6 ON orgs.id=op6.org_id AND op6.key='ldap_start_tls'"
 		" LEFT JOIN altnames AS alt ON u.id=alt.user_id AND alt.altname='" + q_user + "'"
-		" WHERE alt.altname='" + q_user + "' LIMIT 2) LIMIT 2";
+		" LEFT JOIN aliases AS ali ON u.username=ali.mainname AND ali.aliasname='" + q_user + "'"
+		" WHERE alt.altname='" + q_user + "' OR ali.aliasname='" + q_user + "' LIMIT 2) LIMIT 2";
 	if (!conn->query(qstr))
 		return EIO;
 	auto pmyres = conn->store_result();