[PATCH] group stuff in pdb_mysql and pdb_xml

[Stefan (metze) Metzmacher]

Hi Jelmer,

here're patches for pdb_mysql and pdb_xml witch adds the group wrapper functions.

please merge this to 3_0 too. :-)


metze
-----------------------------------------------------------------------------
Stefan "metze" Metzmacher <[EMAIL PROTECTED]>

diff -Npur --exclude=CVS --exclude=*.bak --exclude=*.o --exclude=*.po --exclude=.#* 
HEAD/source/passdb/pdb_mysql.c HEAD-pdb2/source/passdb/pdb_mysql.c
--- HEAD/source/passdb/pdb_mysql.c      Wed Nov  6 14:13:31 2002
+++ HEAD-pdb2/source/passdb/pdb_mysql.c Wed Nov  6 14:12:54 2002
@@ -892,6 +892,59 @@ static NTSTATUS mysqlsam_update_sam_acco
        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;
+}
+
+
 NTSTATUS pdb_init(PDB_CONTEXT * pdb_context, PDB_METHODS ** pdb_method,
                 char *location)
 {
@@ -925,6 +978,13 @@ NTSTATUS pdb_init(PDB_CONTEXT * pdb_cont
        (*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;
diff -Npur --exclude=CVS --exclude=*.bak --exclude=*.o --exclude=*.po --exclude=.#* 
HEAD/source/passdb/pdb_xml.c HEAD-pdb2/source/passdb/pdb_xml.c
--- HEAD/source/passdb/pdb_xml.c        Wed Nov  6 14:13:31 2002
+++ HEAD-pdb2/source/passdb/pdb_xml.c   Wed Nov  6 14:06:36 2002
@@ -546,6 +546,13 @@ NTSTATUS pdb_init(PDB_CONTEXT * pdb_cont
        (*pdb_method)->getsampwsid = NULL;
        (*pdb_method)->update_sam_account = NULL;
        (*pdb_method)->delete_sam_account = NULL;
+       (*pdb_method)->getgrsid = NULL;
+       (*pdb_method)->getgrgid = NULL;
+       (*pdb_method)->getgrnam = NULL;
+       (*pdb_method)->add_group_mapping_entry = NULL;
+       (*pdb_method)->update_group_mapping_entry = NULL;
+       (*pdb_method)->delete_group_mapping_entry = NULL;
+       (*pdb_method)->enum_group_mapping = NULL;
 
        data = talloc(pdb_context->mem_ctx, sizeof(pdb_xml));
        data->location =