Don't duplicate the default group mapping functions - use the ones

from passdb
(This used to be commit 78e135cdb17dcf70d8a1259897fd44ecd7a4b3c6)

diff --git a/source3/modules/mysql.c b/source3/modules/mysql.c
index 47883ca7f7d7ce86c49bfa6e02b355166c6af8cb..40694d6e7d49b18cb6435bfbc8a860d8093fd386 100644 (file)
--- a/source3/modules/mysql.c
+++ b/source3/modules/mysql.c
@@ -893,59 +893,6 @@ static NTSTATUS mysqlsam_update_sam_account(struct pdb_methods *methods,
        return mysqlsam_replace_sam_account(methods, newpwd, 1);
 }
 
-static NTSTATUS mysqlsam_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
-                               DOM_SID sid, BOOL with_priv)
-{
-       return get_group_map_from_sid(sid, map, with_priv) ?
-               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS mysqlsam_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
-                               gid_t gid, BOOL with_priv)
-{
-       return get_group_map_from_gid(gid, map, with_priv) ?
-               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS mysqlsam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
-                               char *name, BOOL with_priv)
-{
-       return get_group_map_from_ntname(name, map, with_priv) ?
-               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS mysqlsam_add_group_mapping_entry(struct pdb_methods *methods,
-                                              GROUP_MAP *map)
-{
-       return add_mapping_entry(map, TDB_INSERT) ?
-               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS mysqlsam_update_group_mapping_entry(struct pdb_methods *methods,
-                                                 GROUP_MAP *map)
-{
-       return add_mapping_entry(map, TDB_REPLACE) ?
-               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS mysqlsam_delete_group_mapping_entry(struct pdb_methods *methods,
-                                                 DOM_SID sid)
-{
-       return group_map_remove(sid) ?
-               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS mysqlsam_enum_group_mapping(struct pdb_methods *methods,
-                                         enum SID_NAME_USE sid_name_use,
-                                         GROUP_MAP **rmap, int *num_entries,
-                                         BOOL unix_only, BOOL with_priv)
-{
-       return enum_group_mapping(sid_name_use, rmap, num_entries, unix_only,
-                                 with_priv) ?
-               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-
 static NTSTATUS mysqlsam_init(struct pdb_context * pdb_context, struct pdb_methods ** pdb_method,
                 const char *location)
 {
@@ -979,13 +926,6 @@ static NTSTATUS mysqlsam_init(struct pdb_context * pdb_context, struct pdb_metho
        (*pdb_method)->add_sam_account = mysqlsam_add_sam_account;
        (*pdb_method)->update_sam_account = mysqlsam_update_sam_account;
        (*pdb_method)->delete_sam_account = mysqlsam_delete_sam_account;
-       (*pdb_method)->getgrsid = mysqlsam_getgrsid;
-       (*pdb_method)->getgrgid = mysqlsam_getgrgid;
-       (*pdb_method)->getgrnam = mysqlsam_getgrnam;
-       (*pdb_method)->add_group_mapping_entry = mysqlsam_add_group_mapping_entry;
-       (*pdb_method)->update_group_mapping_entry = mysqlsam_update_group_mapping_entry;
-       (*pdb_method)->delete_group_mapping_entry = mysqlsam_delete_group_mapping_entry;
-       (*pdb_method)->enum_group_mapping = mysqlsam_enum_group_mapping;
 
        data = talloc(pdb_context->mem_ctx, sizeof(struct pdb_mysql_data));
        (*pdb_method)->private_data = data;