mysql_adaptor: delete unused code for GAB departments

Author: jengelh

exch/mysql_adaptor/sql2.cpp

@@ -375,45 +375,6 @@ int mysql_plugin::get_domain_users(unsigned int domain_id,
 	return false;
 }
 
-int mysql_plugin::get_group_users(unsigned int group_id,
-    std::vector<sql_user> &pfile) try
-{
-	char query[491];
-
-	auto conn = g_sqlconn_pool.get_wait();
-	if (!conn)
-		return false;
-	snprintf(query, std::size(query),
-	         "SELECT u.username, a.aliasname FROM users AS u "
-	         "INNER JOIN aliases AS a ON u.username=a.mainname "
-	         "WHERE u.group_id=%d",
-	         group_id);
-	aliasmap_t amap;
-	aliasmap_load(*conn, query, amap);
-
-	snprintf(query, std::size(query),
-	         "SELECT u.id, p.proptag, p.propval_bin, p.propval_str FROM users AS u "
-	         "INNER JOIN user_properties AS p ON u.group_id=%d AND u.id=p.user_id "
-	         "ORDER BY p.user_id, p.proptag, p.order_id",
-	         group_id);
-	propmap_t pmap;
-	propmap_load(*conn, query, pmap);
-
-	snprintf(query, std::size(query),
-	         "SELECT u.id, u.username, dt.propval_str AS dtypx, u.address_status, "
-	         "u.maildir, z.list_type, z.list_privilege, "
-	         "cl.classname, gr.title FROM users AS u "
-	         JOIN_WITH_DISPLAYTYPE
-	         "LEFT JOIN mlists AS z ON u.username=z.listname "
-	         "LEFT JOIN classes AS cl ON u.username=cl.listname "
-	         "LEFT JOIN `groups` AS `gr` ON `u`.`username`=`gr`.`groupname` "
-	         "WHERE u.group_id=%d", group_id);
-	return userlist_parse(*conn, query, amap, pmap, pfile) >= 0;
-} catch (const std::exception &e) {
-	mlog(LV_ERR, "mysql_adaptor: %s %s", __func__, e.what());
-	return false;
-}
-
 errno_t mysql_plugin::scndstore_hints(unsigned int pri,
     std::vector<sql_user> &hints) try
 {
@@ -963,11 +924,6 @@ bool mysql_adaptor_get_domain_groups(unsigned int id, std::vector<sql_group> &v)
 	return le_mysql_plugin->get_domain_groups(id, v);
 }
 
-int mysql_adaptor_get_group_users(unsigned int id, std::vector<sql_user> &v)
-{
-	return le_mysql_plugin->get_group_users(id, v);
-}
-
 int mysql_adaptor_get_domain_users(unsigned int id, std::vector<sql_user> &v)
 {
 	return le_mysql_plugin->get_domain_users(id, v);

exch/mysql_adaptor/sql2.hpp

@@ -71,7 +71,6 @@ struct mysql_plugin final {
 	bool get_domain_info(unsigned int domain_id, sql_domain &);
 	bool check_same_org(unsigned int domain_id1, unsigned int domain_id2);
 	bool get_domain_groups(unsigned int domain_id, std::vector<sql_group> &);
-	int get_group_users(unsigned int group_id, std::vector<sql_user> &);
 	int get_domain_users(unsigned int domain_id, std::vector<sql_user> &);
 	bool check_mlist_include(const char *mlist_name, const char *account);
 	bool check_same_org2(const char *domainname1, const char *domainname2);

include/gromox/mysql_adaptor.hpp

@@ -134,7 +134,6 @@ extern GX_EXPORT bool mysql_adaptor_get_org_domains(unsigned int org_id, std::ve
 extern GX_EXPORT bool mysql_adaptor_get_domain_info(unsigned int domain_id, sql_domain &);
 extern GX_EXPORT bool mysql_adaptor_check_same_org(unsigned int domain_id1, unsigned int domain_id2);
 extern GX_EXPORT bool mysql_adaptor_get_domain_groups(unsigned int domain_id, std::vector<sql_group> &);
-extern GX_EXPORT int mysql_adaptor_get_group_users(unsigned int group_id, std::vector<sql_user> &);
 extern GX_EXPORT int mysql_adaptor_get_domain_users(unsigned int domain_id, std::vector<sql_user> &);
 extern GX_EXPORT bool mysql_adaptor_check_mlist_include(const char *mlist_name, const char *account);
 extern GX_EXPORT bool mysql_adaptor_check_same_org2(const char *domainname1, const char *domainname2);

tests/userdb.cpp

@@ -161,11 +161,6 @@ static int t_public()
 		printf("get_domain_groups: OK (%zu groupd)\n", vg.size());
 
 	std::vector<sql_user> vu;
-	if (!mysql_adaptor_get_group_users(1, vu))
-		printf("get_group_users (grp 1): failed\n");
-	else
-		printf("get_group_users (grp 1): OK (%zu users)\n", vu.size());
-
 	if (!mysql_adaptor_get_domain_users(domid, vu))
 		printf("get_domain_users: failed\n");
 	else
@@ -176,8 +171,6 @@ static int t_public()
 	printf("domain_list_query: %s\n", mysql_adaptor_domain_list_query(g_domain) ? "OK" : "no");
 	return -1;
 }
-/*
-*/
 #undef E
 
 int main(int argc, char **argv)